tree 116fb1bb9b0491ef841f4995587b0519856b789f
parent d5f3ea90a5f080db6ca73b3af241211980cb8d8a
author Michael Jumper <mjumper@apache.org> 1476905127 -0700
committer Michael Jumper <mjumper@apache.org> 1476940674 -0700

GUACAMOLE-88: Re-apply fixes omitted from failed merge of pull request #17 (d5f3ea90a5f080db6ca73b3af241211980cb8d8a).