diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-04-06 14:48:00 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-04-06 14:48:00 +0100 |
commit | 1de31d1a085ea52a7de917b23b9c28b32747f864 (patch) | |
tree | 3a7b4f0cea8b5c8004464c99f02a175546c843d3 /net/server.lua | |
parent | 55a1e9a4e2a78ad7d6a5a2a15c708dfaf0fcaaa0 (diff) | |
parent | 2d8a08de123cb93d21bd7015d90b8e5887e2ed54 (diff) | |
download | prosody-1de31d1a085ea52a7de917b23b9c28b32747f864.tar.gz prosody-1de31d1a085ea52a7de917b23b9c28b32747f864.zip |
Merge 0.8->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions