Merge branch 'hotfix/1.2.18' v1.2.18
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 14:51:14 +0000 (10:51 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 14:51:14 +0000 (10:51 -0400)
commit4085185435aa5c0ec61da7886493dc341dd33d1e
tree73aa57c577f37dcb8e7b2723d6327ce4c1ce9240
parent2693bba162e3b27d25598c5193dddb6582ddc688
parentf57ea825ddf86d84a678fa4213efd620d17ad084
Merge branch 'hotfix/1.2.18'