aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-01-09 19:19:06 +0000
committerMatthew Wild <mwild1@gmail.com>2009-01-09 19:19:06 +0000
commitfa0e1edd87a3224e998fd4bad37c03c9d2bfe027 (patch)
tree3915120b658649a92eb47bb1663677607fa0e083 /prosody
parent962ab41be7c3f2377ba4dabf7b9061dcdb1139a7 (diff)
parentbd17ed3f7d3a20cd94ccadbe98bb057f8b8675fc (diff)
downloadprosody-fa0e1edd87a3224e998fd4bad37c03c9d2bfe027.tar.gz
prosody-fa0e1edd87a3224e998fd4bad37c03c9d2bfe027.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions