Merge branch 'master' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 24 Jan 2011 22:16:10 +0000 (14:16 -0800)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 24 Jan 2011 22:16:10 +0000 (14:16 -0800)
commit7d0238f75e9e6157a4c7964ad6c112bee33b5799
tree813fb059572f1db39a9eca6eea2edda770775b29
parentc0c7ecce3ce54cf8b30ef65e81bd1cd8e6f29fd0
parented24d8110ba2e70d69e15322e02cfee1a39824bb
Merge branch 'master' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole
src/main/webapp/index.html