Commit a9823c52 a9823c523e416cd2d2e4525d2aed45ec35f4755d by Nicolas Perriault

Merge branch '1.0'

2 parents 0e69c75e 9e0ba3cb
1 branches: 1 branches:
2 only: 2 only:
3 - master 3 - master
4 - 1.1-dev 4 - 1.0
5 before_script: 5 before_script:
6 - "npm install -g jshint" 6 - "npm install -g jshint"
7 - "phantomjs --version" 7 - "phantomjs --version"
......