]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Wed, 21 Mar 2012 16:32:11 +0000 (17:32 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 21 Mar 2012 16:32:11 +0000 (17:32 +0100)

Trivial merge