Added some comment about UTF-16 encoding to String::data().
Small fix of a comment
Add support for ID3v2 SYLT frames (synchronized lyrics).
Add support for ID3v2 ETCO frames (event timing codes).
Merge pull request #362 from ufleisch/master

Add support for synchronized lyrics (SYLT) and event timing codes (ETCO) for ID3v2
Changed cmake_minimum_required from 2.6.0 to 2.8.0.
Merge pull request #371 from TsudaKageyu/cmake-ver

Changed cmake_minimum_required from 2.6.0 to 2.8.0.
Suppressed the warning "Policy CMP0022 is not set" on CMake 2.8.12.
Add ALBUMARTIST property mapping for MP4

https://code.google.com/p/mp4v2/wiki/iTunesMetadata
Merge pull request #377 from amigadave/master

Add ALBUMARTIST property mapping for MP4
Merge pull request #372 from TsudaKageyu/cmake-warning

Suppressed the warning "Policy CMP0022 is not set" on CMake 2.8.12.
Add ALBUMARTIST property mapping for WMA
Merge pull request #356 from TsudaKageyu/string-comment

Added some comment about UTF-16 encoding to String::data().
Removed a wrong note from a comment in tstring.h.
Merge pull request #380 from TsudaKageyu/fix-comment

Removed a wrong note from a comment in tstring.h.
Merge branch 'master' into merge-master-to-taglib2

Conflicts:
	taglib/asf/asftag.cpp
	taglib/mp4/mp4tag.cpp
	taglib/toolkit/tstring.h
Merge pull request #381 from TsudaKageyu/merge-master-to-taglib2

Merged master into taglib2.