Scott Wheeler 0884945567 Merge branch 'master' into taglib2
Conflicts:
	tests/test_aiff.cpp
	tests/test_flac.cpp
2014-09-25 16:39:26 +02:00
..
2014-09-25 16:39:26 +02:00
2013-09-23 21:02:30 -04:00