[med-svn] [SCM] jellyfish branch, master, updated. upstream/1.1.5-21-gf7eb6f0

[Andreas Tille]

The following commit has been merged in the master branch:
commit d34f71a334b44c864a44a0543f2c427cc390b4b6
Merge: 8e7aa50262175fe031bce17d111a2995a4f62590 a3cc522fd6708d67c7d0dbc77f34c7457086f3d8
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 5 11:58:49 2013 +0200

    Merge tag 'upstream/1.1.10'
    
    Upstream version 1.1.10


-- 
count k-mers of DNA