aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-04-19 14:44:08 +0200
committerKim Alvefur <zash@zash.se>2013-04-19 14:44:08 +0200
commitdffd8d701d680d9d9c30dcf3ed384cb703604eed (patch)
tree7dfc363e6ecf609a3504e70e9d87d2da74c8f49f /net
parent5d47f4cd480305344b4fbc71c1cf942706444f31 (diff)
parentcde9a241329154a18fb46eb43fd19f21b5e7b665 (diff)
downloadprosody-dffd8d701d680d9d9c30dcf3ed384cb703604eed.tar.gz
prosody-dffd8d701d680d9d9c30dcf3ed384cb703604eed.zip
Merge 0.9->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions