]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 1 Dec 2011 16:45:18 +0000 (17:45 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 1 Dec 2011 16:45:18 +0000 (17:45 +0100)

Trivial merge