diff options
| author | Kim Alvefur <zash@zash.se> | 2015-06-25 18:57:43 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-06-25 18:57:43 +0200 |
| commit | 6e187489a98a403ae236a9595fbd0f80d3ff6490 (patch) | |
| tree | 1b0aa90c356c8219e4165bd4d5136ea99b34e8f1 /net | |
| parent | 7b1c9ac2f7a58d8d91124196fec60206facc840e (diff) | |
| parent | 7b391bc37acca3a5ed62477f18c9e03348a057f5 (diff) | |
| download | prosody-6e187489a98a403ae236a9595fbd0f80d3ff6490.tar.gz prosody-6e187489a98a403ae236a9595fbd0f80d3ff6490.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions