Merge tag 'v1.5.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:27:21 +0000 (09:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:27:21 +0000 (09:27 -0400)
commit55920ccb08b3bc4abaae2f49f31b9029b0b1771f
treefc96f6312d5f5c3f224aa3d46b7dfd6be558401f
parent4120d7547df6229fe1b133a0791341a5a5d1f618
parentea5854426feca8f31afb7aa5e7d669316250c905
Merge tag 'v1.5.21' into develop

v1.5.21