Merge branch 'hotfix/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 1 Dec 2015 20:23:38 +0000 (15:23 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 1 Dec 2015 20:23:38 +0000 (15:23 -0500)
commit38dc3dae3f2d604d733d813500348c55a442456f
treef25e007335a18422634ad60c03174a95e099a29a
parent7036ea98a1be096b2e45e3cdc7abd41966b971b4
parentf0244e285692b84c12863b57c2540e1f954908d2
Merge branch 'hotfix/1.0.4'