]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Fri, 6 Apr 2012 08:19:56 +0000 (10:19 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 6 Apr 2012 08:19:56 +0000 (10:19 +0200)

Trivial merge