diff options
author | Kim Alvefur <zash@zash.se> | 2013-07-24 21:50:38 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-07-24 21:50:38 +0200 |
commit | e2d04faa20852946634b527c097a0315d6621d73 (patch) | |
tree | c0aecb236310c4962c4623ca3ce901dd2238f3d3 /net | |
parent | 663e0d48ce37c968671d5c6ff4fa13d9b84dec69 (diff) | |
parent | 0354320299a86703cc332543f050389aa4c229eb (diff) | |
download | prosody-e2d04faa20852946634b527c097a0315d6621d73.tar.gz prosody-e2d04faa20852946634b527c097a0315d6621d73.zip |
Merge 0.9->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions