]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'crem2' into dev2
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 23 May 2013 09:08:20 +0000 (11:08 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 23 May 2013 09:08:20 +0000 (11:08 +0200)

Trivial merge