Merge branch 'hotfix/1.0.26' v1.0.26
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Oct 2015 00:58:48 +0000 (20:58 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Oct 2015 00:58:48 +0000 (20:58 -0400)
commit89f93d3b222105a12d5196852e18650fe1617db6
tree0f99074b4e932e0127110930d1effc88a4e55efc
parent58e7a7ac625377263ad3c5c99a433ccd6a503add
parent6f39f934437884b3d5dff91fae2e9e5842283770
Merge branch 'hotfix/1.0.26'