Merge.

diff --cc js/irc/ircclient.js
Simple merge

diff --cc js/qwebirc.js
index f5981c470d3fc5c356eb41b2df15ecdee485cc10,03e8b80d1cc0a486777e1b1b73eae1a553cb80b1..8e4b08561d2ffddd46fdda4714bb968aa219d9be
--- 1/js/qwebirc.js
--- 2/js/qwebirc.js
+++ b/js/qwebirc.js
@@@ -1,4 -1,4 +1,4 @@@
- var qwebirc = {ui: {themes: {}, style: {}}, irc: {}, util: {crypto: {}}, config: {}, auth: {}, sound: {}, xdomain: {}};
 -var qwebirc = {ui: {themes: {}, style: {}}, irc: {}, util: {crypto: {}}, config: {}, auth: {}, sound: {}, connected: false};
++var qwebirc = {ui: {themes: {}, style: {}}, irc: {}, util: {crypto: {}}, config: {}, auth: {}, sound: {}, connected: false, xdomain: {}};
  
  if(typeof QWEBIRC_BUILD != "undefined") {
    qwebirc.BUILD = QWEBIRC_BUILD;

diff --cc js/qwebircinterface.js
Simple merge