From: Michael Helmling <helmling@mathematik.uni-kl.de>
Date: Sun, 30 Oct 2011 17:28:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'official/master'
X-Git-Tag: v1.8beta~24^2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=292a377d1ee430c5b67eac7745b7c331ae37afa3;p=taglib

Merge remote-tracking branch 'official/master'
---

292a377d1ee430c5b67eac7745b7c331ae37afa3