Merge branch 'hotfix/1.0.49' v1.0.49
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 15 Dec 2015 15:47:37 +0000 (10:47 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 15 Dec 2015 15:47:37 +0000 (10:47 -0500)
commit2205a02ad5dbc4c584ca999634a2ac12edb5895c
tree26822ca99f45f9ee0b3ce93a49f4c0bf38782cd1
parent4fb3eb59dc1390745ba7385274852af4b155fb0f
parent80b1d1d9d60dcd48f833f4c777b95a141c82e56f
Merge branch 'hotfix/1.0.49'