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

Trivial merge