Merge branch 'release/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:51:10 +0000 (11:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:51:10 +0000 (11:51 -0500)
commitb8ad205d7b360f36b5a3063a1a89b4059040a34b
tree56c484800fc61f4195e1432c6b95e1c5f03ca960
parent43ae5e4e0238c6fe00b756cba2fe9c11d085eec1
parent32d5a560f078068f5de36087e2f43b3508d76d94
Merge branch 'release/1.5.4'