Merge branch 'master' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 3 Jan 2011 07:55:18 +0000 (23:55 -0800)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 3 Jan 2011 07:55:18 +0000 (23:55 -0800)
commit1db0bf7571d7ac2047072984fb1bbb5cd47069a5
tree2447ff9c8203ecde3cc18802cead8e55cc42c117
parentf9394a3cbc0edcacccb6a70ef2e3b82b9e2cf5ba
parent8084ba6577f9fe7b92d4d250c5742483d497f1c0
Merge branch 'master' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole