Merge branch 'hotfix/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 13:29:53 +0000 (08:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 13:29:53 +0000 (08:29 -0500)
commit8a65dfbb448eed91097c4c8f10bbf3e47d5a6486
tree6e9e9f86fcc75e188aa7cd624df805c4af04e1d7
parenta57ad4d0a70493fa35185618f77aef71a421b6d9
parent95d9264339a72e20efa167f975b31fef618b0783
Merge branch 'hotfix/1.0.29'