Merge pull request #8781 from neheb/pros
authorRosen Penev <rosenp@gmail.com>
Tue, 7 May 2019 17:38:12 +0000 (10:38 -0700)
committerGitHub <noreply@github.com>
Tue, 7 May 2019 17:38:12 +0000 (10:38 -0700)
[18.06] Prosody: backport changes from master


Trivial merge