]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 14 Oct 2013 12:49:27 +0000 (14:49 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 14 Oct 2013 12:49:27 +0000 (14:49 +0200)

Trivial merge