From: Erik Garrison <erik.garrison@bc.edu>
Date: Fri, 17 Sep 2010 15:30:59 +0000 (-0400)
Subject: Merge branch 'master' of http://github.com/pezmaster31/bamtools
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9e7f3168db0c2473674f33a66eb63dedba0353f8;p=bamtools.git

Merge branch 'master' of http://github.com/pezmaster31/bamtools

Conflicts:
	src/api/BamIndex.cpp
---

9e7f3168db0c2473674f33a66eb63dedba0353f8