diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:46:41 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:46:41 +0100 |
commit | bbf9d411b846c78408bb4429ebe2dcf3f71d27b2 (patch) | |
tree | 8a526c9d72b13bfaf7a439d7f39d017bd4361bf9 /net/server.lua | |
parent | 205fa926e72483b3d981d96915df59aa9b800b9f (diff) | |
parent | 7bc19cb550ecf722493f59590f6c202c8842079b (diff) | |
download | prosody-bbf9d411b846c78408bb4429ebe2dcf3f71d27b2.tar.gz prosody-bbf9d411b846c78408bb4429ebe2dcf3f71d27b2.zip |
Merge with backout
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions