]> git.donarmstrong.com Git - samtools.git/commitdiff
Merge remote branch 'remotes/pd3/master'
authorPetr Danecek <pd3@sanger.ac.uk>
Wed, 12 Sep 2012 14:45:30 +0000 (15:45 +0100)
committerPetr Danecek <pd3@sanger.ac.uk>
Wed, 12 Sep 2012 14:45:30 +0000 (15:45 +0100)
Conflicts:
misc/bamcheck.c


Trivial merge