aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-13 15:34:33 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-13 15:34:33 +0000
commit2cdf73b6c3d8253849b68c9293f7df8550dc466b (patch)
tree7f4dc829e45a0c9c4e202a2006df9b47bc7f552a /net/server.lua
parent8d64ab2d1fd2d4f0e3150fcdfd037a9771a2e419 (diff)
parent942fd3d9657357ee6c6a47570a54bea4754e585e (diff)
downloadprosody-2cdf73b6c3d8253849b68c9293f7df8550dc466b.tar.gz
prosody-2cdf73b6c3d8253849b68c9293f7df8550dc466b.zip
Merge with backout
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions