]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 31 Jan 2014 16:48:00 +0000 (17:48 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 31 Jan 2014 16:48:00 +0000 (17:48 +0100)

Trivial merge