Merge branch 'zhangmaike/native-client' of ssh://guacamole.git.sourceforge.net/gitroo...
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 6 Dec 2010 01:12:03 +0000 (17:12 -0800)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 6 Dec 2010 01:12:03 +0000 (17:12 -0800)
commit99eb33ed8dafa07159f66d2aaecc0b28881ec388
tree4fb4e27126277eb19ac29e029aff949df0b7fe02
parentb2eb16f71cf0a9424f8e10307e197e313943589c
parenta300b396430c944378f2a95f2a97b8d4f194f2ea
Merge branch 'zhangmaike/native-client' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole into zhangmaike/native-client