Michael Jumper b68f9a0a26 Merge branch 'master' into GUAC-546-REWRITE ...

Conflicts:
	guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/protocol/ProtocolRetrievalService.java
	guacamole/src/main/webapp/scripts/admin-ui.js
	guacamole/src/main/webapp/scripts/service.js

2014-11-23 13:06:12 -08:00

..

net/sourceforge/guacamole/net/basic

GUAC-915: Clean up all log messages within Guacamole.

2014-10-30 17:12:54 -07:00

org/glyptodon/guacamole/net/basic

Merge branch 'master' into GUAC-546-REWRITE

2014-11-23 13:06:12 -08:00