Merge branch 'hotfix/1.0.5' v1.0.5
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 18:30:55 +0000 (14:30 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 18:30:55 +0000 (14:30 -0400)
commit24be63e61f5864991404cb513a3fa44ec7136adf
treea3c2ed29fea4ecdd5c490c83efecf70f7b7d8ebe
parentab04d3b5b776f0addab388aea527549ee037880a
parent6069dd02c1dcecb515c87e30f9a397e43e143502
Merge branch 'hotfix/1.0.5'