tree 116fb1bb9b0491ef841f4995587b0519856b789f
parent d5f3ea90a5f080db6ca73b3af241211980cb8d8a
parent 4e065c7487181453601df3a414eb4cc4526cf13c
author James Muehlner <james.muehlner@guac-dev.org> 1476941034 -0700
committer James Muehlner <james.muehlner@guac-dev.org> 1476941034 -0700

GUACAMOLE-88: Merge changes that were missing from previous failed merge.