Merge branch 'hotfix/1.0.5'
authorIan Weller <ian@gaslightmedia.com>
Thu, 23 Jun 2016 19:25:48 +0000 (15:25 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 23 Jun 2016 19:25:48 +0000 (15:25 -0400)
commit3b17c5776b278db21ac7382d72146ac79b1a518b
tree291b73ad2af95e715a83e88b096a36b406ad5c0d
parent20414e61bd9ba31c273c8bf46e48893dd7b93d80
parente1051d8933736ed7aa659c6f1d5cc7c04e45b280
Merge branch 'hotfix/1.0.5'