Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 5 May 2016 18:51:33 +0000 (14:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 5 May 2016 18:51:33 +0000 (14:51 -0400)
commita773c33284628ac1e4565afa811aea3c555bca74
tree979864ab8c7d3474e942f99215b591bbf4256e11
parenta8c7c88a155591eb128d4d9dd856c147442343e0
parentb875ad1dcd7545eb96ee967019217331db2a27dd
Merge branch 'hotfix/1.0.2'