Merge branch 'hotfix/1.0.4' v1.0.4
authorIan Weller <ian@gaslightmedia.com>
Wed, 6 Jul 2016 16:43:04 +0000 (12:43 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 6 Jul 2016 16:43:04 +0000 (12:43 -0400)
commite313ddc66ba9de3b7e0179acf098c91c8db8f17f
treec62cb83f6005eea26a1465e028c6dea690e2442b
parentfa75a5a02e837861e7369c99c8b6506cab2ba997
parent5f1bbde2d590b3121238b3dd8813fd44e8b3904a
Merge branch 'hotfix/1.0.4'