Merge branch 'hotfix/1.0.38' v1.0.38
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:44:35 +0000 (16:44 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:44:35 +0000 (16:44 -0400)
commit7e5fc7e1edbfa69f781cdaff7be0522bdce00cce
tree8eba06c54c12d8b66e522b8345ce186b117a4259
parent52cecc3aace31e2d0fc126ecf9696d289d58f34f
parent38741d0a8fde680ac46adf3b9b5a25366c00a3d5
Merge branch 'hotfix/1.0.38'