Merge branches 'master' and 'iodevice' into iodevice

diff --cc src/api/internal/BamHeader_p.cpp
Simple merge

diff --cc src/api/internal/BamRandomAccessController_p.cpp
Simple merge

diff --cc src/api/internal/BamReader_p.cpp
Simple merge

diff --cc src/api/internal/BamWriter_p.cpp
Simple merge

diff --cc src/api/internal/BgzfStream_p.cpp
index 4db9b15e25bbda89cec73ce2a0b4f17d8eabba5c,36599b5b363fd6241fcd9fe6dff9a5c3b168235d..3b7074950031b7e0a92fd1c653348a69b2e63174
--- 1/src/api/internal/BgzfStream_p.cpp
--- 2/src/api/internal/BgzfStream_p.cpp
+++ b/src/api/internal/BgzfStream_p.cpp
@@@ -1,9 -1,8 +1,8 @@@
  // ***************************************************************************
  // BgzfStream_p.cpp (c) 2011 Derek Barnett
  // Marth Lab, Department of Biology, Boston College
- // All rights reserved.
  // ---------------------------------------------------------------------------
 -// Last modified: 2 September 2011(DB)
 +// Last modified: 9 September 2011(DB)
  // ---------------------------------------------------------------------------
  // Based on BGZF routines developed at the Broad Institute.
  // Provides the basic functionality for reading & writing BGZF files

diff --cc src/api/internal/BgzfStream_p.h
Simple merge

diff --cc src/shared/bamtools_global.h
Simple merge

diff --cc src/utils/bamtools_utilities.h
index 71d46830df6667895a3ad8a1fcc02fa2652b7784,52098d0c4811c2977c360e573cd16c587b210551..d9a319271c1da6e856325cacc7371e20cc0a978a
--- 1/src/utils/bamtools_utilities.h
--- 2/src/utils/bamtools_utilities.h
+++ b/src/utils/bamtools_utilities.h
@@@ -1,9 -1,8 +1,8 @@@
  // ***************************************************************************
  // bamtools_utilities.h (c) 2010 Derek Barnett, Erik Garrison
  // Marth Lab, Department of Biology, Boston College
- // All rights reserved.
  // ---------------------------------------------------------------------------
 -// Last modified: 9 June 2011
 +// Last modified: 8 September 2011
  // ---------------------------------------------------------------------------
  // Provides general utilities used by BamTools sub-tools.
  // ***************************************************************************