Merge pull request #9 from koajs/bugfix-dependencies

fix: merge-descriptors should be in dependencies

.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: node_js
 node_js:
   - '4'

package.json

@@ -17,21 +17,21 @@
   "dependencies": {
     "debug": "~2.2.0",
     "humanize-ms": "~1.0.1",
-    "ini": "~1.3.4"
+    "ini": "~1.3.4",
+    "merge-descriptors": "~1.0.0"
   },
   "devDependencies": {
     "autod": "*",
-    "beautify-benchmark": "~0.2.4",
+    "beautify-benchmark": "0",
-    "benchmark": "~1.0.0",
+    "benchmark": "1",
     "contributors": "*",
     "istanbul-harmony": "*",
     "jshint": "*",
-    "koa": "~0.21.0",
+    "koa": "1",
-    "mm": "~1.1.0",
+    "mm": "1",
     "mocha": "*",
-    "pedding": "~1.0.0",
+    "pedding": "1",
-    "supertest": "~1.0.1",
+    "supertest": "1"
-    "merge-descriptors": "~1.0.0"
   },
   "homepage": "https://github.com/koajs/locales",
   "repository": {