Merge branch 'master' into grunt-build

Conflicts: package.json
2013-08-24 23:09:04 -05:00
parent e77c961d40 b7f0d2e1fa
commit 5aacdadff8
8 changed files with 232 additions and 147 deletions
@@ -23,7 +23,8 @@
  "devDependencies": {
    "async": "~0.2.9",
    "benchmark": "~1.0",
-    "dust": "~0.3",
+    "dustjs-linkedin": "~2.0.2",
+    "eco": "~1.1.0-rc-3",
    "grunt": "~0.4.1",
    "grunt-contrib-concat": "~0.3.0",
    "grunt-contrib-jshint": "~0.6.3",