Merge 0.9.14 changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/e3d8c3fa Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/e3d8c3fa Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/e3d8c3fa Branch: refs/heads/master Commit: e3d8c3fa125036eb07b018c0b8512ee89c910142 Parents: 2c12c12 6322874 Author: Nick Couchman <vn...@apache.org> Authored: Wed Dec 6 10:04:34 2017 -0500 Committer: Nick Couchman <vn...@apache.org> Committed: Wed Dec 6 10:04:34 2017 -0500 ---------------------------------------------------------------------- CONTRIBUTING | 8 ++++---- ChangeLog | 18 ------------------ DISCLAIMER | 7 ------- Makefile.am | 1 - README | 4 ++-- src/guacd-docker/README.md | 6 +++--- 6 files changed, 9 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
