Merge branch 'hotfix/1.2.30' v1.2.30
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 27 Oct 2016 15:45:28 +0000 (11:45 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 27 Oct 2016 15:45:28 +0000 (11:45 -0400)
commit232ceb25767a15a093494a3f6e17765e75901a03
treedffbd4d95a911764a4b9e989e4a84af105b37d51
parent7c62786b567c8209eb38baaaf11c2095ecf40a20
parentb138579de88c0f28a4428d299ffa84e19300b7b3
Merge branch 'hotfix/1.2.30'