]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 14 Feb 2013 16:23:56 +0000 (17:23 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 14 Feb 2013 16:23:56 +0000 (17:23 +0100)

Trivial merge