Merge branch 'master' into 2.0.0

2014-12-15 14:02:04 +11:00
parent 01286ebd5b e7cbbefc11
commit 6011db7ae1
10 changed files with 69 additions and 27 deletions
--- a/package.json
+++ b/package.json
@@ -61,5 +61,8 @@
    "mocha": "1.21.4",
    "rimraf": "2.2.8",
    "uglify-js": "2.4.15"
+  },
+  "optionalDependencies": {
+    "kexec": "^0.2.0"
  }
 }