Merge branch 'hotfix/1.0.28' 1.0.28
authorIan Weller <ian@gaslightmedia.com>
Mon, 30 Jan 2017 15:56:24 +0000 (10:56 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 30 Jan 2017 15:56:24 +0000 (10:56 -0500)
commita57ad4d0a70493fa35185618f77aef71a421b6d9
treec959d226f595357c4908884a641709dc502e8ef2
parentec0245d1def6270e9417e708c35cbcab380143a2
parent0f05fdbe09ca58a52d34788d32e5099914e68eda
Merge branch 'hotfix/1.0.28'