]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'master' of git.parisson.com:git/teleforma
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 27 Apr 2017 16:44:17 +0000 (18:44 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 27 Apr 2017 16:44:17 +0000 (18:44 +0200)

Trivial merge