]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 26 Jan 2015 00:52:16 +0000 (01:52 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 26 Jan 2015 00:52:16 +0000 (01:52 +0100)

Trivial merge