Mercurial > prosody-hg
diff plugins/mod_privacy.lua @ 2961:db3c0ecce3f4
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 03 Apr 2010 23:09:11 +0100 |
| parents | 692b3c6c5bd2 |
| children | fc7c693e094a |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 03 Apr 2010 23:09:11 +0100 |
| parents | 692b3c6c5bd2 |
| children | fc7c693e094a |