]> git.donarmstrong.com Git - bamtools.git/commitdiff
Merge branches 'master' and 'iodevice' into iodevice
authorderek <derekwbarnett@gmail.com>
Fri, 9 Sep 2011 16:07:31 +0000 (12:07 -0400)
committerderek <derekwbarnett@gmail.com>
Fri, 9 Sep 2011 16:07:31 +0000 (12:07 -0400)

Trivial merge