Merging 0.9.13-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/770a2805 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/770a2805 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/770a2805 Branch: refs/heads/master Commit: 770a2805e4936aa73f17277a7ec6a762fdcc671a Parents: 9ee224f ca3563a Author: Nick Couchman <vn...@apache.org> Authored: Sat Jun 3 22:42:51 2017 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Sat Jun 3 22:42:51 2017 -0400 ---------------------------------------------------------------------- configure.ac | 2 +- doc/Doxyfile | 2 +- src/guacd/man/guacd.8 | 2 +- src/guacd/man/guacd.conf.5 | 2 +- src/guacenc/man/guacenc.1 | 2 +- src/libguac/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------