[med-svn] [khmer] 04/05: Merge tag 'upstream/2.0rc1+dfsg'

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository khmer.

commit 4098cbc3d3221927a65723264dc34a160453ae8f
Merge: b80fa2e f38372a
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Wed Jul 8 16:47:54 2015 -0700

    Merge tag 'upstream/2.0rc1+dfsg'
    
    Upstream version 2.0rc1+dfsg


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/khmer.git