[med-svn] [SCM] jellyfish branch, master, updated. upstream/1.1.2-17-g57ecd16

[Andreas Tille]

The following commit has been merged in the master branch:
commit 1630a7939957c85babec6f0ecf26e4beaf527d56
Merge: 679dc4440058f442e56a4fa71cff5e9559da9eae 62af77d00506b50b6484d6e98c673d332d95f51f
Author: Andreas Tille <tille at debian.org>
Date:   Mon May 21 21:52:08 2012 +0200

    Merge tag 'upstream/1.1.5'
    
    Upstream version 1.1.5


-- 
count k-mers of DNA