Merge branch 'calnh' of woldlab.caltech.edu:samtools into calnh
authorHenry Amrhein <hamrhein@caltech.edu>
Fri, 21 Dec 2012 21:09:23 +0000 (13:09 -0800)
committerHenry Amrhein <hamrhein@caltech.edu>
Fri, 21 Dec 2012 21:09:23 +0000 (13:09 -0800)
Conflicts:
bam_calnh.c


Trivial merge