]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'crem' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Mar 2014 08:44:25 +0000 (09:44 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Mar 2014 08:44:25 +0000 (09:44 +0100)

Trivial merge