[med-svn] [khmer] 03/04: Merge tag 'upstream/2.0+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 b212ff89c81c0e03035976ed85bd0cc071becea9
Merge: 4fd3c5e a9e0b66
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Tue Sep 8 09:47:14 2015 -0700

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

 ChangeLog             | 12 ++++++++++++
 README.rst            | 37 +++++++++----------------------------
 doc/index.rst         |  4 +---
 doc/roadmap.rst       | 44 ++++++++++++++++++++++++--------------------
 khmer/_version.py     |  4 ++--
 tests/test_scripts.py |  9 +++++++--
 6 files changed, 55 insertions(+), 55 deletions(-)

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