diff options
| author | Kim Alvefur <zash@zash.se> | 2014-04-15 20:36:39 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-04-15 20:36:39 +0200 |
| commit | 3a70d6aa0521ac1f7b335190c47d55624a5be131 (patch) | |
| tree | 6a7e09f58e5cd1a43169daaa13f8967b77dc6a15 /net | |
| parent | eac4157946c473f72525227574fca39eba7e6a1a (diff) | |
| parent | c8e173e9c9c639cca54c25f3707de3b9ff58c788 (diff) | |
| download | prosody-3a70d6aa0521ac1f7b335190c47d55624a5be131.tar.gz prosody-3a70d6aa0521ac1f7b335190c47d55624a5be131.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions