aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-05-30 13:49:38 +0100
committerMatthew Wild <mwild1@gmail.com>2009-05-30 13:49:38 +0100
commit9ce3ead7b7e27b36e67b2694530c052b645bfd59 (patch)
treec36d1229f21c6d1a7b5699bcaa4000ec35902de9 /prosody
parentb4359c6b35505c62116b1815a4ef57a042d65900 (diff)
parent175256488b9b8d4f39668e515213b9fe7af261b6 (diff)
downloadprosody-9ce3ead7b7e27b36e67b2694530c052b645bfd59.tar.gz
prosody-9ce3ead7b7e27b36e67b2694530c052b645bfd59.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions