]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Jul 2012 08:55:25 +0000 (10:55 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Jul 2012 08:55:25 +0000 (10:55 +0200)

Trivial merge