]> git.parisson.com Git - telemeta-pages.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 11 Dec 2014 10:46:15 +0000 (11:46 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 11 Dec 2014 10:46:15 +0000 (11:46 +0100)

Trivial merge