| commit | 7d53ce2247d70829185e7d7ffdaff74af0e55d16 | [log] [tgz] |
|---|---|---|
| author | James Muehlner <james.muehlner@guac-dev.org> | Wed Oct 19 22:23:54 2016 -0700 |
| committer | James Muehlner <james.muehlner@guac-dev.org> | Wed Oct 19 22:23:54 2016 -0700 |
| tree | 116fb1bb9b0491ef841f4995587b0519856b789f | |
| parent | d5f3ea90a5f080db6ca73b3af241211980cb8d8a [diff] | |
| parent | 4e065c7487181453601df3a414eb4cc4526cf13c [diff] |
GUACAMOLE-88: Merge changes that were missing from previous failed merge.