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

Trivial merge