]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'crem' of https://github.com/yomguy/Telemeta into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Oct 2012 08:07:36 +0000 (10:07 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Oct 2012 08:07:36 +0000 (10:07 +0200)

Trivial merge