diff options
| author | Kim Alvefur <zash@zash.se> | 2015-07-05 18:00:05 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-07-05 18:00:05 +0200 |
| commit | 31895cd45fbb41608ae19a3c02013d5ee5263f38 (patch) | |
| tree | ffbe134470891e53fe689b44843c22b48c6b680b /net | |
| parent | 21aa02fd1b769ae89fccfd2cd84756f918e2f152 (diff) | |
| parent | 3dd49f5620ef6860767fee2904399a77e242e10e (diff) | |
| download | prosody-31895cd45fbb41608ae19a3c02013d5ee5263f38.tar.gz prosody-31895cd45fbb41608ae19a3c02013d5ee5263f38.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions