Merge branch 'hotfix/1.3.11' v1.3.11
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Sep 2016 20:21:21 +0000 (16:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Sep 2016 20:21:21 +0000 (16:21 -0400)
commit0869303f8ccc993720c576b78f4d955b823b6639
tree5ccc4a185b505cdccc8bd02d184411d7d5f4554c
parent24ef0c8b7ac3aef5cbb9840d27677f1e62cdbf7c
parent5adf64c759934955c238ab4e27aa6fa9a03cfe3d
Merge branch 'hotfix/1.3.11'