Tsuda Kageyu 57e849b0d5 Merge branch 'master' into merge-master-to-taglib2
# Conflicts:
#	taglib/ape/apeitem.cpp
#	taglib/mpeg/mpegheader.cpp
#	taglib/toolkit/tutils.h
2016-02-04 20:48:31 +09:00
..
2015-11-27 00:22:07 +09:00
2015-11-27 00:53:03 +09:00
2015-11-27 09:30:03 +09:00