diff options
author | Kim Alvefur <zash@zash.se> | 2013-05-18 13:20:46 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-05-18 13:20:46 +0200 |
commit | 7681e34f83898993205274a416718dc3db56333d (patch) | |
tree | 0f2cb51dea138f8394524c68f5cfb3f876c3e20b /net | |
parent | 67ee4ff9ad713a73d865c62e4d92aa80dcc40587 (diff) | |
parent | 635e63f81411ccf4474a7e74561e027bd023dd19 (diff) | |
download | prosody-7681e34f83898993205274a416718dc3db56333d.tar.gz prosody-7681e34f83898993205274a416718dc3db56333d.zip |
Merge 0.9->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions