Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 17:21:49 +0000 (12:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 17:21:49 +0000 (12:21 -0500)
commite50484263bb56d084c6de7f3d602b68dce040aad
treececedf76a2e8c22eb661856e9bc63e68e74874ea
parentba065e67a6a63f5407018cf61ffa7a18257ddf3d
parent2ac359d503141d26346701d3afeff2dd109f578c
Merge branch 'hotfix/1.0.5'