]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' of http://vcs.parisson.com/git/telemeta into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 17 Nov 2011 12:03:31 +0000 (13:03 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 17 Nov 2011 12:03:31 +0000 (13:03 +0100)

Trivial merge