Lukáš Lalinský 2316a9661a Merge branch 'master' into taglib2
Conflicts:
	bindings/c/tag_c.cpp
	taglib/fileref.cpp
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tstring.cpp
2013-06-20 15:38:08 +02:00
..
2013-05-20 20:44:12 +02:00
2013-05-20 20:44:12 +02:00
2011-02-25 19:43:25 +00: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