Merge branch 'hotfix/1.2.27'
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Jun 2016 17:12:09 +0000 (13:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Jun 2016 17:12:09 +0000 (13:12 -0400)
commit5e184044f1cb927b0845e80ad259d18cdac4c177
treef0e43234286bc4e904a602d678afc88b54d0678d
parent712b10d7c95318cf1b5f0e23fbfd6515d56f4095
parentb040d558d5655d8df727f1179f5603a24dd8a0b5
Merge branch 'hotfix/1.2.27'