aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-04-15 00:12:32 +0100
committerMatthew Wild <mwild1@gmail.com>2009-04-15 00:12:32 +0100
commit87b05e1fa0b928864f618f6a06d0f1f7eee75042 (patch)
tree29cfb4691c8d107a3ac32ea374edd3b4270cd1e0 /prosody
parent6857f81a91e1368f8ec4280af4e64b2169e3cbb7 (diff)
parent0e6845438050b93130971ba5d2f95ec481887178 (diff)
downloadprosody-87b05e1fa0b928864f618f6a06d0f1f7eee75042.tar.gz
prosody-87b05e1fa0b928864f618f6a06d0f1f7eee75042.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions