From: Steve Hackbarth <stephenhackbarth@gmail.com>
Date: Wed, 17 Sep 2014 14:36:08 +0000 (-0400)
Subject: merge
X-Git-Tag: v4.7.0-beta.2~7^2~1
X-Git-Url: http://git.roojs.org/?p=xtuple;a=commitdiff_plain;h=f5ae301fd348b7546c25ad205199f748fca890ef

merge
---

f5ae301fd348b7546c25ad205199f748fca890ef
diff --cc npm-shrinkwrap.json
index 58a59c9c3,382a101e9..d6d9930ee
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@@ -2018,14 -1854,8 +2018,9 @@@
      },
      "underscore.string": {
        "version": "2.3.3",
 -      "from": "underscore.string@~2.3.3"
 +      "from": "underscore.string@~2.3.3",
 +      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
      },
-     "ursa": {
-       "version": "0.8.0",
-       "from": "ursa@0.8.x",
-       "resolved": "https://registry.npmjs.org/ursa/-/ursa-0.8.0.tgz"
-     },
      "winston": {
        "version": "0.7.3",
        "from": "winston@0.7.x",