]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 28 Jun 2013 21:34:32 +0000 (23:34 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 28 Jun 2013 21:34:32 +0000 (23:34 +0200)

Trivial merge