Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole...
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Tue, 5 Jul 2011 01:35:32 +0000 (18:35 -0700)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Tue, 5 Jul 2011 01:35:32 +0000 (18:35 -0700)
commit69ae1892bc7cf9d2bcce47d8ae0e0feb8b592e4c
treedbe2b04fd81f90b5e16a0485cc1a5296cf329b1d
parent13a14d4915d17297f5bb2cc4c0b9372b2241c88c
parent2e51b5a77a269b964b075001fcb8ac825374f162
Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole into unstable
src/main/webapp/index.xhtml
src/main/webapp/styles/guacamole.css