Software / code / prosody
Diff
core/rostermanager.lua @ 5512:6ebea1e6795b
Merges all the way down
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 23 Apr 2013 15:15:52 +0100 |
| parent | 5429:25333de6e7c7 |
| child | 5747:23076ee191d3 |
| child | 7777:65836cf2d057 |
