]> git.parisson.com Git - telemeta-pages.git/commitdiff
Merge commit 'bf19e3d4bc56e081fd9dc8de712e5d2f9b2e6805' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 15:44:50 +0000 (16:44 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 15:44:50 +0000 (16:44 +0100)

Trivial merge