Merge branch 'hotfix/1.5.18' v1.5.18
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Apr 2016 20:49:34 +0000 (16:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Apr 2016 20:49:34 +0000 (16:49 -0400)
commit89d20650f8cf849a6741199674e372966728aa5b
tree03730c0196ca4134c44f7f7820cd996ddacbf1d7
parent3edf2e965e8683202a2dbcccc5dc7e14f83f7304
parente89a87bed4c7c26d62abb2591774abd3adeb8e8c
Merge branch 'hotfix/1.5.18'