Commit b41fb432 b41fb432b933f0e0724729a7db4c024e1b59b128 by Nicolas Perriault

Merge branch 'master' into 1.1-dev

2 parents a069829f d9b240c8
branches:
only:
- master
- testcase
- 1.1-dev
before_script:
- "npm install -g jshint"
- "phantomjs --version"
......