Merge branch 'hotfix/1.0.4' v1.0.4
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 19:09:51 +0000 (15:09 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 19:09:51 +0000 (15:09 -0400)
commita6071b78d3d42c6160562e331e455055a78c77a6
tree15cdf05f2a355827a67d705585a04e1ae8cb18e7
parentd5eae22fc0d3ae47b5f318bb772acc10fce418d1
parent7de486ae8aed8282c485570c4ed92a4f17ef8451
Merge branch 'hotfix/1.0.4'