]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 15 Jan 2013 09:39:43 +0000 (10:39 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 15 Jan 2013 09:39:43 +0000 (10:39 +0100)

Trivial merge