]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 26 Sep 2012 11:35:36 +0000 (13:35 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 26 Sep 2012 11:35:36 +0000 (13:35 +0200)

Trivial merge