Mercurial > prosody-hg
diff plugins/mod_dialback.lua @ 5854:16a2bb97c5f5
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Oct 2013 12:15:25 -0400 |
| parents | 8ea6fa8459e3 |
| children | a1da78658a82 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Oct 2013 12:15:25 -0400 |
| parents | 8ea6fa8459e3 |
| children | a1da78658a82 |