Merge branch 'hotfix/1.5.10' v1.5.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Dec 2016 20:00:59 +0000 (15:00 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Dec 2016 20:00:59 +0000 (15:00 -0500)
commit4eafe1eb55ce076cec3b2f779e56ea8b79020f35
tree53ee253e83376d236db4ed26f27a497779e6a508
parent56655735cee2d4225b0c5cb034cc259cef2d4286
parent9a8487dff4f7a438ab422cf484a6daf78328298a
Merge branch 'hotfix/1.5.10'