[med-svn] [htslib] 05/05: 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 7b2a2d09a273c951e5936cbdfda66601828b2a46
Merge: 9469458 c8ec7cb
Author: Charles Plessy <plessy at riken.jp>
Date:   Fri Nov 22 13:58:53 2013 +0900

    Merge branch 'develop' into debian/unstable

 vcf.c      |    4 ++++
 vcfutils.c |   22 ++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

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