From: Linda Nichols <lynnaloo@gmail.com>
Date: Sun, 15 Jun 2014 03:30:45 +0000 (+0000)
Subject: Merge branch '4_6_x' into 23853
X-Git-Tag: v4.6.0-beta~23^2~23
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=944e3b50d3b682ad296888254fa91cd0846b0153;p=xtuple

Merge branch '4_6_x' into 23853
---

944e3b50d3b682ad296888254fa91cd0846b0153
diff --cc npm-shrinkwrap.json
index 9bb5a077e,40bfd2c78..2ce6b8d99
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@@ -348,10 -308,13 +348,14 @@@
          }
        }
      },
+     "node-forge": {
+       "version": "0.6.2",
+       "from": "node-forge@0.6.x"
+     },
      "oauth2orize": {
        "version": "0.1.0",
 -      "from": "oauth2orize@0.1.x",
 +      "from": "oauth2orize@0.1.0",
 +      "resolved": "https://registry.npmjs.org/oauth2orize/-/oauth2orize-0.1.0.tgz",
        "dependencies": {
          "debug": {
            "version": "0.7.4",