Commit b41fb432 b41fb432b933f0e0724729a7db4c024e1b59b128 by Nicolas Perriault

Merge branch 'master' into 1.1-dev

2 parents a069829f d9b240c8
1 branches: 1 branches:
2 only: 2 only:
3 - master 3 - master
4 - testcase 4 - 1.1-dev
5 before_script: 5 before_script:
6 - "npm install -g jshint" 6 - "npm install -g jshint"
7 - "phantomjs --version" 7 - "phantomjs --version"
......