Mercurial > prosody-hg
diff core/usermanager.lua @ 2944:855c0eb80600
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 25 Mar 2010 18:53:17 +0000 |
| parents | 060bb8217fea |
| children | 0acfae4da199 596303990c7c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 25 Mar 2010 18:53:17 +0000 |
| parents | 060bb8217fea |
| children | 0acfae4da199 596303990c7c |