Merge branch 'hotfix/1.2.19' v1.2.19
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:13 +0000 (14:50 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:13 +0000 (14:50 -0400)
commita2ce93a47dff5510712f2e20e94631ac83dc34b9
tree99a095b264934c954492ab6af0163d58d14bbf6c
parent4085185435aa5c0ec61da7886493dc341dd33d1e
parent472bbf132475384eaa61a38541f1adce4ea586c3
Merge branch 'hotfix/1.2.19'