Merge branch 'hotfix/1.0.40' v1.0.40
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Oct 2015 18:52:58 +0000 (14:52 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Oct 2015 18:52:58 +0000 (14:52 -0400)
commit972deddb99a2a0fddde7db65447b6c1215e15e79
tree12410f5de1bea01c2f0cbba4da5c66799c207266
parent01b3e26c1d713b869767031a7bd7c506dc3cf54f
parente6d20244171d6f5a3e99307a4eeb5f62070d9f25
Merge branch 'hotfix/1.0.40'