Merge branch 'hotfix/1.5.2' v1.5.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 18:32:19 +0000 (14:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 18:32:19 +0000 (14:32 -0400)
commitccfa38ae3bd7495a7eb12aaff44fa079ef20e97a
tree7d827e982c8e16989ec40f126e586861456414eb
parentb5e1db74e206baf97ca6b6f815d8b75a3e26ff02
parent1a676c69c653197a51bab6d3c53447b5d26c7b4b
Merge branch 'hotfix/1.5.2'