]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Oct 2013 13:53:11 +0000 (15:53 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Oct 2013 13:53:11 +0000 (15:53 +0200)

Trivial merge