Tsuda Kageyu 1a9c49e42b Merge branch 'master' into merge-master-to-taglib2
Conflicts:
	taglib/asf/asftag.cpp
	taglib/mp4/mp4tag.cpp
	taglib/toolkit/tstring.h
2014-04-11 18:31:49 +09:00
..
2013-10-05 13:59:59 -04:00
2013-10-05 14:03:19 -04:00
2013-06-07 20:00:13 +09:00
2013-05-21 12:03:43 +02:00
2012-07-11 14:15:12 +02:00