Merge branch 'hotfix/1.0.33' v1.0.33
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 21 Oct 2015 21:16:22 +0000 (17:16 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 21 Oct 2015 21:16:22 +0000 (17:16 -0400)
commit2227d8145e88207abc1535a59350e904721ccccf
tree7f411a004fb8f6f49893298225b25decedbea625
parente1cc005ac2457e15ac83a0dcc35bc77298ef5ff4
parent38cbad326a75dcbf584ca84f3a4ae3952155fd89
Merge branch 'hotfix/1.0.33'