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
..
2013-10-05 13:59:59 -04:00
2013-10-05 14:03:19 -04:00
2012-07-11 14:15:12 +02:00
2014-09-14 18:03:27 +01:00