Merge branch 'hotfix/1.2.5'
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Oct 2015 20:49:54 +0000 (16:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Oct 2015 20:49:54 +0000 (16:49 -0400)
commit935998ce6cb1eddcd08636379d229847d5a5029c
treec9ef5cb5b76c5b345eabf68c3b1ac147932f2f1b
parentd2d3d65f802f140239c101bfad8b31857038959a
parent22a592ad1cd0e365b2e7c2186e5f7e3756b14749
Merge branch 'hotfix/1.2.5'