Merge 0.9.12-incubating changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/4fe5d7f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/4fe5d7f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/4fe5d7f6 Branch: refs/heads/master Commit: 4fe5d7f642fc5a1795d4feb2149ceb2e693f0bdb Parents: 2703c5a 6939142 Author: James Muehlner <[email protected]> Authored: Sun Feb 26 00:23:52 2017 -0800 Committer: James Muehlner <[email protected]> Committed: Sun Feb 26 00:23:52 2017 -0800 ---------------------------------------------------------------------- ----------------------------------------------------------------------
