Mercurial > prosody-hg
diff core/s2smanager.lua @ 2692:b669a0ae99e2
Merge trunk with trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 21 Feb 2010 16:44:37 +0000 |
| parents | 4516888fc42d |
| children | 9c5d8e0c146e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 21 Feb 2010 16:44:37 +0000 |
| parents | 4516888fc42d |
| children | 9c5d8e0c146e |