diff options
| author | Kim Alvefur <zash@zash.se> | 2015-12-27 12:29:28 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-12-27 12:29:28 +0100 |
| commit | e1b247f298550899a261e9188784154dec7f4c15 (patch) | |
| tree | 50c569b3a43e2bf21301dba4606a02940a6ed127 /net | |
| parent | 9cf26570d1ed58175107e606a044506e5210f501 (diff) | |
| parent | 6e6e46038c6d65b1f00a4c532cb4b90da007807f (diff) | |
| download | prosody-e1b247f298550899a261e9188784154dec7f4c15.tar.gz prosody-e1b247f298550899a261e9188784154dec7f4c15.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions