]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 1 Mar 2013 10:49:17 +0000 (11:49 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 1 Mar 2013 10:49:17 +0000 (11:49 +0100)

Trivial merge