Merge branch 'hotfix/1.1.2'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:45:23 +0000 (08:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:45:23 +0000 (08:45 -0500)
commit22a5e69b05f1f348f4242e8c675984431df45349
tree8754afd92c59c47f10944d84feb203412f52814c
parentf912548dfa3209975591b8aa8511193c531fa991
parent0d822c5f090bc2800af33f263b5734e1e42965ee
Merge branch 'hotfix/1.1.2'