Merge pull request #16 from mithro/master
authorenjoy-digital <florent@enjoy-digital.fr>
Fri, 13 Jan 2017 13:57:56 +0000 (14:57 +0100)
committerGitHub <noreply@github.com>
Fri, 13 Jan 2017 13:57:56 +0000 (14:57 +0100)
Fixing accidental revert in merge commit.


Trivial merge