aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-04 18:49:00 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-04 18:49:00 +0000
commita1173c8d66cdfd8f22d34c09508a20098819bdbf (patch)
tree45cded6f238a663f14e24f02ecae383e23031852 /prosody
parent83fc91cb1069a562620d2220c2b0c0afdc609a22 (diff)
parent327c81737eb11a340005c7078015c46fdfea6390 (diff)
downloadprosody-a1173c8d66cdfd8f22d34c09508a20098819bdbf.tar.gz
prosody-a1173c8d66cdfd8f22d34c09508a20098819bdbf.zip
Automated merge with http://waqas.ath.cx/
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions