Merge branch 'hotfix/1.0.6' v1.0.6
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 19:01:58 +0000 (15:01 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 19:01:58 +0000 (15:01 -0400)
commit65d4fa4e815f35ce1f0d2528ebda0a4982ad4bf0
tree74164d4ac2c335fbb306fddfc5457bd1b03b19de
parent24be63e61f5864991404cb513a3fa44ec7136adf
parent405964ad1835876736a895336fc82c2091f41005
Merge branch 'hotfix/1.0.6'