Merge remote branch 'upstream/master' into requirejs

2011-01-29 01:03:32 +01:00 · 2011-01-29 01:03:32 +01:00 · bfdcc1e5b4
commit bfdcc1e5b4
parent c4e7ccd9c8 be2e78616e
32 changed files with 1394 additions and 696 deletions
--- a/package.json
+++ b/package.json
@ -28,7 +28,7 @@
        "asyncjs": ">=0.0.2",
        "jsdom": ">=0.1.23",
        "htmlparser": ">=1.7.2",
-        "dryice": ">=0.1.0"
+        "dryice": ">=0.2.1"
    },
    "licenses": [{
        "type": "MPL",