Merge branch 'hotfix/1.2.15' v1.2.15
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 6 Jul 2016 21:01:35 +0000 (17:01 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 6 Jul 2016 21:01:35 +0000 (17:01 -0400)
commit06db9d8948d0d8116401697d5addecef5386958f
treeaabc62b9bf243338e8ae34fd6c44e5c7fdefefb6
parent0c57d366a6a50fe66c013708711cedb9c56cb2cd
parent7410c45431772eafdd639723dbc816fa5208575e
Merge branch 'hotfix/1.2.15'