]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Wed, 30 Nov 2011 12:24:29 +0000 (13:24 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 30 Nov 2011 12:24:29 +0000 (13:24 +0100)

Trivial merge