]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Dec 2013 11:13:21 +0000 (12:13 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Dec 2013 11:13:21 +0000 (12:13 +0100)

Trivial merge