Merge branch 'hotfix/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 14:12:26 +0000 (10:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 14:12:26 +0000 (10:12 -0400)
commit13b1d5db86dfd1ba44090b4acbd836ee05b51aa7
treeb8cb9b91f8d90bdf876141499d75e613fb24b56c
parenteac2f6c211fc7ebe3a692723c54c10fb279f8977
parent270c1be5afdd310abb478ec78789230fdfa593b2
Merge branch 'hotfix/1.2.1'