Merge branch 'master' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole

diff --cc src/main/webapp/index.html
index 5b26ee3,47d0e9b..d4132f6
--- 1/src/main/webapp/index.html
--- 2/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@@ -214,12 -213,11 +213,15 @@@
                  var guacErrorImage = new Image();
                  guacErrorImage.src = "images/noguacamole-logo.png";
  
 +                guac.setNameHandler(function(name) {
 +                    document.title = name;
 +                });
 +
                  guac.setErrorHandler(function(error) {
+ 
                      menu.className = "error";
+                     display.className += " guac-error";
+ 
                      logo.src = guacErrorImage.src;
                      errorDialogText.textContent = error;
                      errorDialog.style.visibility = "visible";