Merge branch 'hotfix/1.0.4'
authorIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:52:18 +0000 (15:52 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:52:18 +0000 (15:52 -0400)
commitf3aa818666bf9c1d163ef490197a0addffbd18a5
tree86515c8bb14ab6ac85d377f3122f0b751a14c9cc
parent8dabc20083ef587984571e06886a3271cbcee407
parentebf62ad5149d6bc22d089a662051b77d3ed6c00b
Merge branch 'hotfix/1.0.4'