Merge branch 'master' into 9998-unsigned_manifest
authorTom Clegg <tom@curoverse.com>
Wed, 23 Nov 2016 16:33:38 +0000 (11:33 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 23 Nov 2016 16:33:38 +0000 (11:33 -0500)
commita714babda599431fd509dff6dee87ab30a1793eb
tree6a590255401a443c31cfca345fed68d23fd732d3
parent4f4f6f5fe9367d5cd6c57070fd8a223efc87cb21
parenta983bbeec3db12156cc96741034ffe8d4053866b
Merge branch 'master' into 9998-unsigned_manifest