Merge branch 'master' into unstable

This commit is contained in:
Michael Jumper committed 2013-08-28 14:04:35 -07:00
commit 9bf27bfb69
1 file changed
+1 -1
@@ -1,5 +1,5 @@
package org.glyptodon.guacamole.net.basic;
package net.sourceforge.guacamole.net.basic;
/*
* Guacamole - Clientless Remote Desktop