From: Erik Garrison <erik.garrison@bc.edu>
Date: Wed, 8 Sep 2010 19:36:39 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/pezmaster31/bamtools
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=90bb3691f9aa2a2e8a4dd906c2439c7bc434eb78;p=bamtools.git

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

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

90bb3691f9aa2a2e8a4dd906c2439c7bc434eb78