Mercurial > prosody-hg
diff plugins/storage/mod_xep0227.lua @ 4321:4dcdba6900f2
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 12 Jun 2011 22:21:10 +0100 |
| parents | 9a1f6239b63c |
| children | b5a5643f8572 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 12 Jun 2011 22:21:10 +0100 |
| parents | 9a1f6239b63c |
| children | b5a5643f8572 |