]> granicus.if.org Git - taglib/commitdiff
Merge remote-tracking branch 'official/master'
authorMichael Helmling <helmling@mathematik.uni-kl.de>
Thu, 1 Sep 2011 14:33:39 +0000 (16:33 +0200)
committerMichael Helmling <helmling@mathematik.uni-kl.de>
Thu, 1 Sep 2011 14:33:39 +0000 (16:33 +0200)

Trivial merge