]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Oct 2012 21:17:00 +0000 (23:17 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Oct 2012 21:17:00 +0000 (23:17 +0200)

Trivial merge