aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-01-07 15:14:24 +0000
committerMatthew Wild <mwild1@gmail.com>2009-01-07 15:14:24 +0000
commit96f91c20ad8e8fd71eee480ca56eacea606ada52 (patch)
treec8ae13fe7daf3b1c0a578a7cb441eebfe5cf3b7d /net
parent7c24c84226680524cdfc5e43c8fece0ee838ee8f (diff)
parent046e69447ea86916d08d0f834512794a588c6e4a (diff)
downloadprosody-96f91c20ad8e8fd71eee480ca56eacea606ada52.tar.gz
prosody-96f91c20ad8e8fd71eee480ca56eacea606ada52.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions