[med-svn] [htslib] 07/08: Merge branch 'develop' 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 htslib.

commit 1a76ced9322496b06f6d509b8b72de3fd894cfe4
Merge: 7b2a2d0 7092725
Author: Charles Plessy <plessy at riken.jp>
Date:   Wed Dec 4 13:37:39 2013 +0900

    Merge branch 'develop' into debian/unstable

 htslib/klist.h |  2 +-
 htslib/sam.h   |  3 +++
 sam.c          | 61 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 55 insertions(+), 11 deletions(-)

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/htslib.git