]> git.parisson.com Git - telemeta-pages.git/commitdiff
Merge branch 'master' of github.com:Parisson/Telemeta-pages
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 11 Dec 2014 11:01:50 +0000 (12:01 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 11 Dec 2014 11:01:50 +0000 (12:01 +0100)

Trivial merge