]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 19 Dec 2012 18:36:09 +0000 (19:36 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 19 Dec 2012 18:36:09 +0000 (19:36 +0100)

Trivial merge