Merge branch 'hotfix/1.5.21' v1.5.21
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:27:16 +0000 (09:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:27:16 +0000 (09:27 -0400)
commitea5854426feca8f31afb7aa5e7d669316250c905
treefc96f6312d5f5c3f224aa3d46b7dfd6be558401f
parent94099be174e0ad46f62b1476dbf74f2cd6edb542
parent47f1f5086f630dd0fc0dab7c6800496437b9b4b9
Merge branch 'hotfix/1.5.21'