Merge branch 'hotfix/1.5.20' v1.5.20
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Apr 2016 14:30:07 +0000 (10:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Apr 2016 14:30:07 +0000 (10:30 -0400)
commit94099be174e0ad46f62b1476dbf74f2cd6edb542
tree73ddc52e5af5d0d28bda1db6bf52c036ddb77d0e
parent751fc553049945c25aaa3b9c31438b0585a1d16f
parentcde2106bd27bd50d475dea67210de9e824109c02
Merge branch 'hotfix/1.5.20'