]> granicus.if.org Git - taglib/commitdiff
Merge remote-tracking branch 'official/master'
authorMichael Helmling <helmling@mathematik.uni-kl.de>
Sat, 14 Jan 2012 19:57:15 +0000 (20:57 +0100)
committerMichael Helmling <helmling@mathematik.uni-kl.de>
Sat, 14 Jan 2012 19:57:15 +0000 (20:57 +0100)

Trivial merge