Merge branch 'hotfix/1.6.15' v1.6.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 20:31:15 +0000 (15:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 20:31:15 +0000 (15:31 -0500)
commit1712f0afc4adebd0978fc0db035436eca4bf9cd8
tree0535323cea2b47fc336c63dbff7b58b7991883a3
parentcb14316b895a1710d0d43885078a16629af8fe79
parent5cf2bc15d380fed8835e6e59ad18455f927ab800
Merge branch 'hotfix/1.6.15'