merged develop 0.7.0

.versions

@@ -1,3 +1,3 @@
-ethereum:web3@0.5.0
+ethereum:web3@0.7.0
 meteor@1.1.6
 underscore@1.0.3

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "web3",
   "namespace": "ethereum",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Ethereum Compatible JavaScript API",
   "main": [
     "./dist/web3.js",

lib/utils/browser-xhr.js

@@ -0,0 +1,9 @@
+'use strict';
+
+// go env doesn't have and need XMLHttpRequest
+if (typeof XMLHttpRequest === 'undefined') {
+    exports.XMLHttpRequest = {};
+} else {
+    exports.XMLHttpRequest = XMLHttpRequest; // jshint ignore:line
+}
+

lib/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.6.1"
+    "version": "0.7.0"
 }

package.js

@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
   name: 'ethereum:web3',
-  version: '0.6.1',
+  version: '0.7.0',
   summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
   git: 'https://github.com/ethereum/ethereum.js',
   // By default, Meteor will default to using README.md for documentation.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "web3",
   "namespace": "ethereum",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Ethereum JavaScript API, middleware to talk to a ethereum node over RPC",
   "main": "./index.js",
   "directories": {
@@ -13,6 +13,7 @@
     "xmlhttprequest": "*"
   },
   "browser": {
+    "xmlhttprequest": "./lib/utils/browser-xhr.js"
   },
   "devDependencies": {
     "bower": ">=1.4.1",