]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into develop
authoryomguy <yomguy@parisson.com>
Wed, 2 May 2012 14:33:40 +0000 (16:33 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 2 May 2012 14:33:40 +0000 (16:33 +0200)

Trivial merge