Commit a9823c52 a9823c523e416cd2d2e4525d2aed45ec35f4755d by Nicolas Perriault

Merge branch '1.0'

2 parents 0e69c75e 9e0ba3cb
branches:
only:
- master
- 1.1-dev
- 1.0
before_script:
- "npm install -g jshint"
- "phantomjs --version"
......