aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-25 01:37:13 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-25 01:37:13 +0000
commit449e72c7363f6bb316ba516e20a79d01f8b2a558 (patch)
tree4e99a91122be3df0e1d74e02791b9fd0fdc68087 /prosody.cfg.lua.dist
parent1f5c712bcd35210ccc29e821ad367d38c8e53d1e (diff)
parent385317309cf0ebbeddc6ebdfe7daa69a73e8f79c (diff)
downloadprosody-449e72c7363f6bb316ba516e20a79d01f8b2a558.tar.gz
prosody-449e72c7363f6bb316ba516e20a79d01f8b2a558.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions