Merge branch 'hotfix/1.2.35' v1.2.35
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:38:31 +0000 (15:38 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:38:31 +0000 (15:38 -0500)
commit5a164bdef213acb4b0ea0c09b60d471a5d7a529c
treee4a820ad79e7badcbe03d980ed5674af48b4692a
parent2096242aa71d73da45c7009ad999a4263eafb10b
parentfa8a1a47565e0661922071330ab95a4e0d4d7666
Merge branch 'hotfix/1.2.35'