]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Mon, 31 Oct 2011 13:31:49 +0000 (14:31 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 31 Oct 2011 13:31:49 +0000 (14:31 +0100)

Trivial merge