Merge changes for 0.9.10-incubating release 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/e0e42e8a Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/e0e42e8a Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/e0e42e8a Branch: refs/heads/master Commit: e0e42e8aa8dbbf689250ed36697042f6a3ec1646 Parents: ecc3a7d 68fdd4d Author: James Muehlner <[email protected]> Authored: Sun Dec 18 10:51:15 2016 -0800 Committer: James Muehlner <[email protected]> Committed: Sun Dec 18 10:51:15 2016 -0800 ---------------------------------------------------------------------- Makefile.am | 14 +++++++++---- README | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 68 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
