Merge branch 'hotfix/1.5.1' v1.5.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Feb 2016 19:40:50 +0000 (14:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Feb 2016 19:40:50 +0000 (14:40 -0500)
commit8c2dacdd01e54dbf42dc7b65a3aacd544f6a5635
tree9a3fdf487fdc2758e88b2b65f91ea520885036fd
parent843890f9f50e686ccdbfbe395376f0047b86570a
parentb6479acc4f3581338ed3a57358209b48c6a359a1
Merge branch 'hotfix/1.5.1'