Merge remote-tracking branch 'origin/master'

jhnns · jhnns · commit 9b9944227159 · 2012-06-04T02:39:58.000+02:00
Conflicts:
	package.json
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
         "email" : "mail@johannesewald.de",
         "web" : "http://johannesewald.de"
     },
-    "main" : "./lib/index.js",
+    "main" : "lib/index.js",
     "bugs" : {
         "url" : "http://github.com/jhnns/rewire/issues",
         "email" : "mail@johannesewald.de"
