]> granicus.if.org Git - taglib/commitdiff
Merge remote-tracking branch 'official/master'
authorMichael Helmling <helmling@mathematik.uni-kl.de>
Wed, 4 Jan 2012 18:49:50 +0000 (19:49 +0100)
committerMichael Helmling <helmling@mathematik.uni-kl.de>
Wed, 4 Jan 2012 18:49:50 +0000 (19:49 +0100)

Trivial merge