Merge branch 'bugzillatweaks' into next.

This is a horribly botched branch merged.

Conflicts:
	chip-data/chipNames.json
	data/lib/bugzillaDOMFunctions.js
	data/lib/bzpage.js
	data/lib/jumpNextBug.js
	data/lib/otherButtons.js
	data/lib/queries.js
	data/lib/util.js
	data/rhlib/addAttachmentRow.js
	data/rhlib/fixingAttMIME.js
	data/rhlib/rhbzpage.js
	data/tweaks/bug-page-mod.js
	data/tweaks/viewSource.js
	lib/libbugzilla.js
	lib/main.js
	package.json

1 files changed, 1 insertions, 3 deletions

diff --git a/lib/libbugzilla.js b/lib/libbugzilla.js
index b49e776..2dc1dc5 100644
--- a/lib/libbugzilla.js
+++ b/lib/libbugzilla.js
@@ -11,7 +11,6 @@ var passUtils = require("passwords");
 var Request = require("request").Request;
 var selfMod = require("self");
 var urlMod = require("url");
-var dataUtils = require("utils/data");
 var xrpc = require("xmlrpc");
 var panelMod = require("panel");
 
@@ -21,7 +20,7 @@ var BTSPrefNS = "bugzilla-triage.setting.";
 var BTSPassRealm = "BTSXMLRPCPass";
 var copiedAttributes = [ "queryButton", "upstreamButton", "parseAbrtBacktraces",
                          "submitsLogging", "XorgLogAnalysis", "objectStyle", "signature",
-                         "suspiciousComponents" ];
+                         "suspiciousComponents", "verboseInlineHistory" ];
 
 
 var passwords = {}; // hash of passwords indexed by a hostname
@@ -345,7 +344,6 @@ exports.makeJSONRPCCallWithLogin = function makeJSONRPCCallWithLogin(url, method
       password: passObj.password,
       remember: false
     }, function(logResult) {
-      console.log("logResult = " + logResult.toSource());
       makeJSONRPCCall(url, method, params, callback);
     });
   }