]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 24 Nov 2011 11:42:01 +0000 (12:42 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 24 Nov 2011 11:42:01 +0000 (12:42 +0100)

Trivial merge