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

Trivial merge