Merge 0.9.14-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/025fc052 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/025fc052 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/025fc052 Branch: refs/heads/master Commit: 025fc0525f28b05be206d1471e2d8d488f97cb14 Parents: 95be88b 233f5e2 Author: Michael Jumper <mjum...@apache.org> Authored: Mon Nov 6 11:29:37 2017 -0800 Committer: Michael Jumper <mjum...@apache.org> Committed: Mon Nov 6 11:29:37 2017 -0800 ---------------------------------------------------------------------- configure.ac | 4 +--- src/protocols/rdp/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
