]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 10:26:39 +0000 (12:26 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 10:26:39 +0000 (12:26 +0200)

Trivial merge