Tsuda Kageyu 2b5fee2df1 Merge branch 'master' into merge-master
Conflicts:
	AUTHORS
	ConfigureChecks.cmake
	config.h.cmake
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tfilestream.cpp
	taglib/toolkit/tstring.cpp
	tests/test_id3v2.cpp
2013-05-19 15:45:15 +09:00
..
2011-02-25 19:43:25 +00:00
2013-05-02 13:41:26 +09:00
2012-07-11 14:15:12 +02:00
2013-05-03 11:44:36 +09:00