Merge branch 'hotfix/1.6.1' v1.6.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 13:55:23 +0000 (08:55 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 13:55:23 +0000 (08:55 -0500)
commit94b6a018bf02b678ebe39289698301aca5c0d928
tree0ffced2398438622254764bd66f1d4c55bb7ade6
parent9a36eb514350fcf43515e2fa4e3ffc357db93f1e
parentf3010826c73b87f01f2446e267a7a28af9be86c2
Merge branch 'hotfix/1.6.1'