Merge branch 'hotfix/1.0.35' v1.0.35
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 23 Oct 2015 15:50:11 +0000 (11:50 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 23 Oct 2015 15:50:11 +0000 (11:50 -0400)
commit6e71759f1aa3f5f92dcbf67660eefbc63d8de150
treee1da8f56ce4f2a02440677d33cff4c71f5fe9845
parent7843a82e0468d843d57eef53d7b1491ad827a6d0
parent091e2a0b230b3588ab3e0825711861b37ca45a0c
Merge branch 'hotfix/1.0.35'