commit | d4f58f2c0d812b05c392e06438e659902e8121f8 | [log] [tgz] |
---|---|---|
author | James Muehlner <james.muehlner@guac-dev.org> | Thu Nov 08 22:18:28 2018 -0800 |
committer | James Muehlner <james.muehlner@guac-dev.org> | Thu Nov 08 22:18:28 2018 -0800 |
tree | c6c2b2781c26c24bae98b2d7e0772f77c1c8dba8 | |
parent | 756ec2fcc480871e0535d8c9fc4ca1af6c9bd519 [diff] | |
parent | 4d858451c9e8029d58e29adcb4f87b6749f35ed9 [diff] |
Merge changes from 1.0.0 back to master.