Merge branch 'hotfix/1.3.13' v1.3.13
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 19:33:52 +0000 (14:33 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 19:33:52 +0000 (14:33 -0500)
commit6bf52d943198670703cd5367a4d2dd7834c01c75
tree335c396a561897e887e219e7f989fe845d3c2238
parent0577d1b63a990de77d6f339f89fe62a15ddc4668
parent780781d91bba19d359026a2dd5d75ffbeda4ff2e
Merge branch 'hotfix/1.3.13'