aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-01-29 21:15:33 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-01-29 21:15:33 +0500
commit39d122abaf1e00c41c8604c17deb27386a6b2223 (patch)
tree0ad7b60a2112a5c02a948d968771c15653f6c183 /net
parent927e5d1974eba1e152bbe5de9796b3343b7a40fb (diff)
parenta24c95d2c90c47339ae396cf7ae5132769269f14 (diff)
downloadprosody-39d122abaf1e00c41c8604c17deb27386a6b2223.tar.gz
prosody-39d122abaf1e00c41c8604c17deb27386a6b2223.zip
Merge with trunk.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions