Mercurial > prosody-hg
diff plugins/mod_presence.lua @ 3197:f1db45e89317
Merge trunk/MattJ->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 07 Jun 2010 12:21:57 +0100 |
| parents | d35b181a895a |
| children | 5a4e766a3577 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 07 Jun 2010 12:21:57 +0100 |
| parents | d35b181a895a |
| children | 5a4e766a3577 |