Lukáš Lalinský db892c43e7 Merge branch 'master' into taglib2
Conflicts:
	taglib/mp4/mp4tag.cpp
	taglib/mp4/mp4tag.h
	taglib/toolkit/tfile.cpp
2012-11-23 10:17:16 +01:00
..
2012-10-13 08:55:23 +02:00
2012-10-13 08:55:23 +02:00
2011-02-25 19:43:25 +00:00
2012-07-11 14:15:12 +02:00
2012-11-12 16:32:15 +01:00