From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Mon, 9 Apr 2012 00:50:53 +0000 (-0700)
Subject: Merge branch 'touch-toolbar' into unstable
X-Git-Url: http://git.alex.org.uk

Merge branch 'touch-toolbar' into unstable

Conflicts:
	src/main/webapp/scripts/interface.js
---

edad1df9a193e4a0e752f3aff727792d53534631
diff --cc src/main/webapp/scripts/interface.js
index 1f5e7a5,b3681db..6b6c132
--- a/src/main/webapp/scripts/interface.js
+++ b/src/main/webapp/scripts/interface.js
@@@ -706,4 -744,4 +744,4 @@@ GuacamoleUI.attach = function(guac) 
          guac.sendKeyEvent(0, KEYSYM_CTRL);
      };
  
--};
++};