Merge branch 'master' of github.com:mzabriskie/axios into xDomainRequestSupport

Conflicts:
	package.json

lib/adapters/xhr.js

@@ -4,7 +4,7 @@
 
 var defaults = require('./../defaults');
 var utils = require('./../utils');
-var buildURL = require('./../helpers/buildUrl');
+var buildURL = require('./../helpers/buildURL');
 var parseHeaders = require('./../helpers/parseHeaders');
 var transformData = require('./../helpers/transformData');
 var isURLSameOrigin = require('./../helpers/isURLSameOrigin');

lib/helpers/buildURL.js

@@ -65,3 +65,4 @@ module.exports = function buildURL(url, params, paramsSerializer) {
 
   return url;
 };
+