Merge tag 'v1.5.18' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Apr 2016 20:49:45 +0000 (16:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Apr 2016 20:49:45 +0000 (16:49 -0400)
commit33f257e4434cfd322acc66f2133adb6cfd07db39
tree03730c0196ca4134c44f7f7820cd996ddacbf1d7
parentda8e3d70a0ac9dd15c9941e18976567961f1e1e3
parent89d20650f8cf849a6741199674e372966728aa5b
Merge tag 'v1.5.18' into develop

Version 1.p5.18