Merge branch 'hotfix/1.5.7' v1.5.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 15:10:50 +0000 (10:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 15:10:50 +0000 (10:10 -0500)
commit359c51d223fbcb15c063df771e0bf969d6d20c88
tree8122aa74a08cf884ccd27116e17ce2eb40d8b0e5
parentfb91dda52077dbb64951eac4b6e61e981ad498f7
parent08199427784589fdb531e3c5e6ce66f0809f5302
Merge branch 'hotfix/1.5.7'