Mercurial > prosody-hg
diff plugins/mod_auth_cyrus.lua @ 6727:eb9c842b80fa
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 May 2015 23:23:44 +0200 |
| parents | 2c7e1ce8f482 |
| children | 0ba461b7d9af |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 May 2015 23:23:44 +0200 |
| parents | 2c7e1ce8f482 |
| children | 0ba461b7d9af |