Merge branch 'hotfix/2.6.2' v2.6.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Oct 2016 19:37:05 +0000 (15:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Oct 2016 19:37:05 +0000 (15:37 -0400)
commitb55654b24fda0c28aae3a9a59132e0bd8112c088
treeb6937b08f53015ddf0412988ac9df595712a3892
parent8397ee93876293c190ab0408ceb50df4d2fec22b
parent0b6c46a99348d4f508f26f2aba639748f2f0b9a7
Merge branch 'hotfix/2.6.2'