Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:43:55 +0000 (11:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:43:55 +0000 (11:43 -0500)
commitd35292bb69258638c2140cce19e4c3a616148221
tree671f142819df31d4f2d73f713f166c508fb11226
parentff9c3ce0118a240bb3cc7cba75b1dcb5708ed9a5
parentebf406683b9533d0b41f0af43ba0cb85f1997fa0
Merge tag 'v1.0.18' into develop

v1.0.18