Merge branch 'master' into develop

Author: debris

bower.json

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

dist/web3-light.js

@@ -230,10 +230,10 @@ var toHex = function (val) {
     if (isString(val)) {
         if (val.indexOf('-0x') === 0)
             return fromDecimal(val);
-        else if (!isFinite(val))
-            return fromAscii(val);
         else if(val.indexOf('0x') === 0)
             return val;
+        else if (!isFinite(val))
+            return fromAscii(val);
     }
 
     return fromDecimal(val);

dist/web3-light.min.js

@@ -1,3 +1,3 @@
 {
-    "version": "0.9.1"
+    "version": "0.9.2"
 }

dist/web3.js

@@ -35,7 +35,7 @@ HttpProvider.prototype.isConnected = function() {
     var request = new XMLHttpRequest();
 
     request.open('POST', this.host, false);
-    request.setRequestHeader('Content-type','application/json');
+    request.setRequestHeader('Content-Type','application/json');
 
     try {
         request.send(JSON.stringify({
@@ -54,7 +54,7 @@ HttpProvider.prototype.send = function (payload) {
     var request = new XMLHttpRequest();
 
     request.open('POST', this.host, false);
-    request.setRequestHeader('Content-type','application/json');
+    request.setRequestHeader('Content-Type','application/json');
 
     try {
         request.send(JSON.stringify(payload));
@@ -98,7 +98,7 @@ HttpProvider.prototype.sendAsync = function (payload, callback) {
     };
 
     request.open('POST', this.host, true);
-    request.setRequestHeader('Content-type','application/json');
+    request.setRequestHeader('Content-Type','application/json');
 
     try {
         request.send(JSON.stringify(payload));

dist/web3.js.map

@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
   name: 'ethereum:web3',
-  version: '0.9.1',
+  version: '0.9.2',
   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.