Merge branch 'hotfix/1.0.5'
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:22:36 +0000 (14:22 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:22:36 +0000 (14:22 -0400)
commit38ae7f7e037e7a571231b737d190a79507392971
treedabc8c8cc79d8a7003dd73e1b6d7d41082df1bbb
parentf3aa818666bf9c1d163ef490197a0addffbd18a5
parent9fb7f089b78e0dfb1ad6142f7ee01ddf3025723d
Merge branch 'hotfix/1.0.5'