Mercurial > prosody-hg
diff plugins/mod_dialback.lua @ 6000:0f6399c86c10
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 21 Jan 2014 03:24:40 +0000 |
| parents | 8ea6fa8459e3 |
| children | a1da78658a82 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 21 Jan 2014 03:24:40 +0000 |
| parents | 8ea6fa8459e3 |
| children | a1da78658a82 |