:Merge branch 'hotfix/1.0.4' 1.0.4
authorIan Weller <ian@gaslightmedia.com>
Fri, 6 May 2016 12:22:10 +0000 (08:22 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 6 May 2016 12:22:10 +0000 (08:22 -0400)
commit893a6414dbdaf69cab130f1a64660b204c9e2e55
treee8dbbbd94ec009b642e1f97fbe5ee07d516e53ea
parent9528fe2069999db7f393d2beb7c77d2eba63c617
parentf64a22a376362c6aabdb75da8be8f048532ae6b1
:Merge branch 'hotfix/1.0.4'