[med-svn] [sra-sdk] 02/07: Merge tag 'upstream/2.3.2-4+dfsg'

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository sra-sdk.

commit d982ac8d296afa2926bacb28a9eadc30150b12fa
Merge: bad95ef 228e4f2
Author: Andreas Tille <tille at debian.org>
Date:   Tue Aug 13 14:57:16 2013 +0200

    Merge tag 'upstream/2.3.2-4+dfsg'
    
    Upstream version 2.3.2-4+dfsg
    
    Conflicts:
    	libs/ext/Makefile
    	libs/ext/bzip2/Makefile
    	libs/ext/zlib/Makefile

 libs/ext/Makefile       |  101 ---------------------------
 libs/ext/bzip2/Makefile |  166 --------------------------------------------
 libs/ext/zlib/Makefile  |  175 -----------------------------------------------
 3 files changed, 442 deletions(-)

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/sra-sdk.git