From: Petr Danecek <pd3@sanger.ac.uk>
Date: Wed, 12 Sep 2012 14:45:30 +0000 (+0100)
Subject: Merge remote branch 'remotes/pd3/master'
X-Git-Url: https://git.donarmstrong.com/?p=samtools.git;a=commitdiff_plain;h=a71383ee344af03b1d8084a7ed8752a12f68e8e7

Merge remote branch 'remotes/pd3/master'

Conflicts:
	misc/bamcheck.c
---

a71383ee344af03b1d8084a7ed8752a12f68e8e7