Mercurial > prosody-hg
diff plugins/mod_presence.lua @ 3196:d35b181a895a
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 07 Jun 2010 12:19:14 +0100 |
| parents | 28a5c0bda928 a31559c52842 |
| children | 5a4e766a3577 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 07 Jun 2010 12:19:14 +0100 |
| parents | 28a5c0bda928 a31559c52842 |
| children | 5a4e766a3577 |