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)
commit0141067413f5c65f3f0c867ea2a45754c382e2cf
treea7913eb128041113b5eec8dd438550b824835bb4
parent41c85f8ef5298b76443341b02fed37160dbcb68a
parent2653eabd4d67565734e87aafbdaf112a2158189a
Merge pull request #8781 from neheb/pros

[18.06] Prosody: backport changes from master