]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 20 Sep 2012 14:55:58 +0000 (16:55 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 20 Sep 2012 14:55:58 +0000 (16:55 +0200)

Trivial merge