Mercurial > prosody-hg
diff core/rostermanager.lua @ 5469:fcdcc37ffec1
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Apr 2013 00:45:46 +0100 |
| parents | 25333de6e7c7 |
| children | 23076ee191d3 65836cf2d057 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Apr 2013 00:45:46 +0100 |
| parents | 25333de6e7c7 |
| children | 23076ee191d3 65836cf2d057 |