Merge branch 'master' of github.com:c9/newclient into feature/scm

.gitignore

@@ -69,7 +69,7 @@ plugins/c9.account.*/node_modules/
 test/selenium/notify/
 test/selenium/results/
 testresults
-cfresult
+*cfresult*
 
 .c9revisions
 .settings

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.455",
+    "version": "3.1.470",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

plugins/c9.core/http-xhr.js

@@ -88,7 +88,7 @@ define(function(require, module, exports) {
                     xhr.abort();
                     var err = new Error("Timeout");
                     err.code = "ETIMEOUT";
-                    err.data = {url: url, query: options.query};
+                    err.data = {url: url, query: options.query, timeout: timeout};
                     done(err);
                 }, timeout);
             }