]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' of /var/git/telemeta
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 2 May 2012 14:07:35 +0000 (16:07 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 2 May 2012 14:07:35 +0000 (16:07 +0200)

Trivial merge