Merge branch 'hotfix/1.1.3'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:53:50 +0000 (08:53 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:53:50 +0000 (08:53 -0500)
commit188142dea2834aff3adaebe8b10407059033d6a9
tree997ce7e02496376b707932c1a7a03dac6b3f4a6c
parent22a5e69b05f1f348f4242e8c675984431df45349
parent49c6706ade6f8e27c8d0ddcc7a26380e42c6029c
Merge branch 'hotfix/1.1.3'