From: Jack Allnutt <m2ys4u@Gmail.com>
Date: Fri, 2 Nov 2012 19:10:33 +0000 (+0000)
Subject: Merge branch 'master' of github.com:prawnsalad/KiwiIRC
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ba739d8920d4041adde749c73dfb24eb052581d4;p=KiwiIRC.git

Merge branch 'master' of github.com:prawnsalad/KiwiIRC

Conflicts:
	package.json
---

ba739d8920d4041adde749c73dfb24eb052581d4
diff --cc package.json
index ab4dde3,d983167..35b177b
--- a/package.json
+++ b/package.json
@@@ -7,8 -7,8 +7,9 @@@
    "dependencies": {
      "node-static": "0.5.9",
      "uglify-js": "1.2.3",
--    "socket.io": "0.8.7",
-     "underscore": "1.3.3"
++    "socket.io": "0.8.7",
+     "underscore": "1.3.3",
+     "daemonize2": "0.4.0-rc.5"
 -  }
 +  },
-   "private": true
++  "private": true
  }