]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'develop' into lam
authoryomguy <yomguy@parisson.com>
Wed, 30 May 2012 09:37:44 +0000 (11:37 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 30 May 2012 09:37:44 +0000 (11:37 +0200)

Trivial merge