]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta into crem crem
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 14 Nov 2014 00:15:27 +0000 (01:15 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 14 Nov 2014 00:15:27 +0000 (01:15 +0100)

Trivial merge