]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Mon, 13 Feb 2012 22:25:51 +0000 (23:25 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 13 Feb 2012 22:25:51 +0000 (23:25 +0100)

Trivial merge