Merge branch 'hotfix/1.0.1' v1.0.1
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:43:49 +0000 (14:43 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:43:49 +0000 (14:43 -0400)
commit6edccc8ec3eeab00f6150501b0876143d8e6aa96
treea4b0a4ea67d5fba9b7f66a8432b36eeffc12dde0
parentccdb2f7afd360adeed66c447fcb38a147d05fc29
parentfd0d8f5962a0305190b999621995a1fe857232f7
Merge branch 'hotfix/1.0.1'