]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'crem' of https://github.com/yomguy/Telemeta into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 24 Nov 2011 10:26:12 +0000 (11:26 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 24 Nov 2011 10:26:12 +0000 (11:26 +0100)

Trivial merge