From: Henry Amrhein <hamrhein@caltech.edu>
Date: Fri, 21 Dec 2012 21:09:23 +0000 (-0800)
Subject: Merge branch 'calnh' of woldlab.caltech.edu:samtools into calnh
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=samtools.git;a=commitdiff_plain;h=e7386d6d3c4569e9e58c1d036925f4adf45ace56

Merge branch 'calnh' of woldlab.caltech.edu:samtools into calnh

Conflicts:
	bam_calnh.c
---

e7386d6d3c4569e9e58c1d036925f4adf45ace56