Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 27 Feb 2014 11:41:37 +0000 (11:41 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 27 Feb 2014 11:41:37 +0000 (11:41 +0000)
1  2 
src/lib/sndfile_decoder.cc

Simple merge