Merge branch 'master' into eejs

This commit is contained in:
Egil Moeller 2012-03-13 17:51:42 +01:00
commit 5f7f382a9e
34 changed files with 182 additions and 165 deletions

View file

@ -12,7 +12,7 @@
"dependencies" : {
"yajsml" : "1.1.2",
"request" : "2.9.100",
"require-kernel" : "1.0.3",
"require-kernel" : "1.0.5",
"socket.io" : "0.8.7",
"ueberDB" : "0.1.7",
"async" : "0.1.18",