[med-svn] [khmer] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/khmer

[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 1d8ac59c3931320747d716ce3d757122ab2219e2
Merge: 622ceaf 9c7a7c2
Author: Michael R. Crusoe <mcrusoe at msu.edu>
Date:   Sat Jan 31 09:46:17 2015 -0500

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/khmer

 debian/control        |  3 ++-
 debian/khmer.1.ronn   | 33 +++++++++++++++++++++++++++++++++
 debian/khmer.manpages |  1 +
 debian/rules          |  6 ++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --cc debian/control
index efad844,546f4fd..c0dde09
--- a/debian/control
+++ b/debian/control
@@@ -14,7 -14,7 +14,8 @@@ Build-Depends: python-screed
                 zlib1g-dev,
                 libbz2-dev,
                 python-nose,
-                python-sphinx
++               python-sphinx,
+                ruby-ronn
  Standards-Version: 3.9.5
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/khmer.git
  Vcs-Git: git://anonscm.debian.org/debian-med/khmer.git

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