Merge branch 'hotfix/1.2.7' v1.2.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:56:48 +0000 (16:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:56:48 +0000 (16:56 -0400)
commit685d808b0f68fb8b28489e1679c6ce1ef062e968
tree43e253c0946d4b8b97e6905e0edc804c97dc0130
parentae23be5d9665a0bc8f2bfa312e161b6e26643223
parent118185c63f2ce2342d96f5658602ebaa56eb4666
Merge branch 'hotfix/1.2.7'