Merge branch 'hotfix/1.5.1' v1.5.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 17:10:53 +0000 (13:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 17:10:53 +0000 (13:10 -0400)
commitb5e1db74e206baf97ca6b6f815d8b75a3e26ff02
treec2f0ed2fb318f450b1e829bb26caf24cb79d1dc5
parent372b473fd43869cabab4712618c67b01ab667612
parent2d25b9b68670416c36331ac2c2c692ba05f3d20a
Merge branch 'hotfix/1.5.1'