]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'crem' of https://github.com/yomguy/Telemeta into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Oct 2012 21:48:04 +0000 (23:48 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Oct 2012 21:48:04 +0000 (23:48 +0200)

Trivial merge