]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 8 Apr 2013 10:28:42 +0000 (12:28 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 8 Apr 2013 10:28:42 +0000 (12:28 +0200)

Trivial merge