diff options
| author | Kim Alvefur <zash@zash.se> | 2014-04-10 16:52:03 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-04-10 16:52:03 +0200 |
| commit | 1c3053a6ebcb9fc16051becc296f61b82e14e100 (patch) | |
| tree | 775860fdc145200d44619a577a34cc1ea83fda8f /net | |
| parent | 87020b4789013b1d8ff33d7929d455392b1d9638 (diff) | |
| parent | 3e9c8c83841a92b59147928f7f03260ff228cd7e (diff) | |
| download | prosody-1c3053a6ebcb9fc16051becc296f61b82e14e100.tar.gz prosody-1c3053a6ebcb9fc16051becc296f61b82e14e100.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions