From: Lukas Krejci <krejclu6@fel.cvut.cz>
Date: Sun, 18 May 2014 14:29:54 +0000 (+0200)
Subject: Merge branch 'krejclu6_chapters' of https://github.com/krejclu6/taglib into krejclu6_... 
X-Git-Tag: v1.10beta~171^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=459adc69ad44d523a6f5f0ae75a8ee6d0d8487b1;p=taglib

Merge branch 'krejclu6_chapters' of https://github.com/krejclu6/taglib into krejclu6_chapters

Conflicts:
	taglib/mpeg/id3v2/id3v2framefactory.cpp
	tests/test_id3v2.cpp
---

459adc69ad44d523a6f5f0ae75a8ee6d0d8487b1