[med-svn] samtools 02/02: Merge branch 'debian/unstable' of git+ssh://git.debian.org/git/debian-med/samtools into debian/unstable

[Charles Plessy]

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

plessy pushed a commit to branch debian/unstable
in repository samtools.

commit 4a5274b48c80c97f05bb2f78215ad1a5d7c4083c
Merge: c740a12 663b1a8
Author: Charles Plessy <plessy at debian.org>
Date:   Thu Dec 24 13:50:30 2015 +0900

    Merge branch 'debian/unstable' of git+ssh://git.debian.org/git/debian-med/samtools into debian/unstable

 debian/README.source              |  4 +++
 debian/changelog                  | 38 +++++++++++++++++----
 debian/control                    |  9 ++---
 debian/mans/ace2sam.1             | 24 ++++++++++++++
 debian/mans/samtools.pl.1         | 19 +++++++++++
 debian/mans/wgsim.1               | 44 +++++++++++++++++++++++++
 debian/patches/mayhem.patch       | 69 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 debian/rules                      |  5 ---
 debian/samtools.install           |  1 +
 debian/samtools.lintian-overrides |  4 +++
 11 files changed, 203 insertions(+), 15 deletions(-)

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