aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-02-19 13:13:54 +0000
committerMatthew Wild <mwild1@gmail.com>2009-02-19 13:13:54 +0000
commita562843a9b1e0a8eb70b68d871eeca6268173828 (patch)
treec49a590588f0d3bf66da67f6f7bd71277b2f68df /prosody
parent3b253992f156d8c91a1d9be6141349e032fa49bf (diff)
parentb783d074206a70c3541fb3229ec3b1e20d38cdcf (diff)
downloadprosody-a562843a9b1e0a8eb70b68d871eeca6268173828.tar.gz
prosody-a562843a9b1e0a8eb70b68d871eeca6268173828.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions