Mercurial > prosody-modules
diff mod_webpresence/mod_webpresence.lua @ 927:a9dfa7232d88
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:10:25 +0000 |
| parents | 1c9a3454eb43 |
| children | 432dc4056114 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:10:25 +0000 |
| parents | 1c9a3454eb43 |
| children | 432dc4056114 |