merge from master

package.json

@@ -1,6 +1,6 @@
 {
   "name": "log4js",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Port of Log4js to work with node.",
   "keywords": [
     "logging",
@@ -21,7 +21,7 @@
     "node": ">=0.8"
   },
   "scripts": {
-    "test": "vows"
+    "test": "mocha"
   },
   "directories": {
     "test": "test",
@@ -29,17 +29,16 @@
   },
   "dependencies": {
     "async": "0.1.15",
-    "dequeue": "1.0.3",
     "semver": "~1.1.4",
     "readable-stream": "~1.0.2",
-    "weak": "~0.2.2"
   },
   "devDependencies": {
-    "vows": "0.7.0",
     "sandboxed-module": "0.1.3",
-    "hook.io": "0.8.10",
     "underscore": "1.2.1",
     "mocha": "~1.12.0",
     "should": "~1.2.2"
+  },
+  "browser": {
+    "os": false
   }
 }