Merge branch 'hotfix/1.3.6' v1.3.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Sep 2016 14:37:37 +0000 (10:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Sep 2016 14:37:37 +0000 (10:37 -0400)
commit4d47f45556d5519582fa42ca88783695e34db49c
treea22b8ab35723456eca8cd0bab70bb41697bc0aea
parent9bbdc0cafe206b2ce946b53d17e3ea65f61cb9a1
parent410c1c61c285f4f141d8d6446cbc72b0f6f45496
Merge branch 'hotfix/1.3.6'