Merge branch 'dev'

cheton · cheton · commit 3d2f10167fbb · 2017-01-06T18:45:58.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: node_js
 node_js:
+  - '6'
   - '5'
   - '4'
   - '0.12'
   - '0.10'
-  - 'iojs'
 after_success:
   - npm run coveralls
   - npm run coverage-clean
