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)
commit00fdb9f0614adf3d2352da96c32a2419a636c5c2
tree19926777d6ec88b0c33b155d893610e195070b84
parentff31959aea1e3815d95798996c3999f122314ae6
parent9c0e978556a568631975d6f417aad1cdb8b17dfc
Merge pull request #16 from mithro/master

Fixing accidental revert in merge commit.