Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Wed, 22 Jun 2016 14:49:32 +0000 (10:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 22 Jun 2016 14:49:32 +0000 (10:49 -0400)
commit9638e118eda8840e7b1254391ba4be439a96a25a
tree7b394fe32df65a28e98444c8c4e06b25c09e1acb
parent96df460f00bb4dacfd8d9b79b8eec4404601e959
parenta116d2ac381de6b820275f5a6c8c52df10b54f0f
Merge branch 'hotfix/1.0.2'