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

Trivial merge