Merge branch 'hotfix/1.1.12' v1.1.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Jan 2017 18:39:55 +0000 (13:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Jan 2017 18:39:55 +0000 (13:39 -0500)
commit945f068a6e5ce3f0f60d0e258525d638c4ce57c1
treeb01d79e4b43c1b035ebd2fab75cd9f95e623993a
parent1475e894a1fbcca0b889b750a6e6e20d81a29439
parent3f2b7f12e72b2a8efbf98c8f773f5731995f58d9
Merge branch 'hotfix/1.1.12'