Merge branch 'hotfix/1.0.24' v/1.0.24
authorIan Weller <ian@gaslightmedia.com>
Tue, 15 Mar 2016 13:00:47 +0000 (09:00 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 15 Mar 2016 13:00:47 +0000 (09:00 -0400)
commitf875f08dd690e3d81ac01906a52536d30a45fac4
treed17b44f521a558bcf9ee50ada1c3e3fc0079ab28
parente803bad56742ce8b7a5b371ea4dbe67b46bb7c8d
parent6c46ffc2d3e56fc35bf9bce62a13ba0f1de72bf5
Merge branch 'hotfix/1.0.24'