]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into lam2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 27 Apr 2015 16:38:29 +0000 (18:38 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 27 Apr 2015 16:38:29 +0000 (18:38 +0200)

Trivial merge