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)
commitcc3900735839ff4b0da0c046b5c606c440ba917a
treed95d2208d2b77683d7e9d3a4ae7441ef871e3c90
parent58588c485eac7c488a574fe923576f109ec0134e
parent713b673456dee8e2a089e9193080b3c91f8aee94
Merge master.
src/lib/sndfile_decoder.cc