]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into lam
authoryomguy <yomguy@parisson.com>
Thu, 31 May 2012 20:32:18 +0000 (22:32 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 31 May 2012 20:32:18 +0000 (22:32 +0200)

Trivial merge