]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 14:17:30 +0000 (15:17 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 14:17:30 +0000 (15:17 +0100)

Trivial merge