Mercurial > prosody-hg
diff plugins/storage/mod_xep0227.lua @ 5935:a367bae38385
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 11 Dec 2013 22:31:48 +0000 |
| parents | 060d7fc6caf4 |
| children |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 11 Dec 2013 22:31:48 +0000 |
| parents | 060d7fc6caf4 |
| children |