]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'crem' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 17:37:11 +0000 (18:37 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 17:37:11 +0000 (18:37 +0100)

Trivial merge