[med-svn] [SCM] jellyfish branch, master, updated. upstream/1.1.2-4-gcc8765e

[Andreas Tille]

The following commit has been merged in the master branch:
commit 9db247277b352da55f74e03cf54ee7ec3d1e769e
Merge: 6529ac1a2916faf781c227cd16dfab240bc57611 7a5c7043bf69981ebcd1d4658e4f9400e5d3f757
Author: Andreas Tille <tille at debian.org>
Date:   Sat Mar 31 00:20:00 2012 +0200

    Merge tag 'upstream/1.1.4'
    
    Upstream version 1.1.4


-- 
count k-mers of DNA