diff options
author | Kim Alvefur <zash@zash.se> | 2013-08-09 16:03:48 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-08-09 16:03:48 +0200 |
commit | 7dd77281432685907926d50feb2d32c0c2a0ec8c (patch) | |
tree | fc6a25f3e3d479e2f2653002fdb120e9a4676ffb /net/server.lua | |
parent | 3a97810358162d7bf45920edb93f38863b96e6fb (diff) | |
parent | 4041ef0137933b3ef6e0b1de00b26d3f7ee49ad0 (diff) | |
download | prosody-7dd77281432685907926d50feb2d32c0c2a0ec8c.tar.gz prosody-7dd77281432685907926d50feb2d32c0c2a0ec8c.zip |
Merge 0.9->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions