Merge branch 'master' into unstable

This commit is contained in:
Michael Jumper
2013-08-28 14:04:35 -07:00

View File

@@ -1,5 +1,5 @@
package org.glyptodon.guacamole.net.basic; package net.sourceforge.guacamole.net.basic;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop