diff options
| author | Kim Alvefur <zash@zash.se> | 2013-11-28 16:17:51 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-11-28 16:17:51 +0100 |
| commit | 1d911dd1d1983c0a2fc604f99f26e76a19b361db (patch) | |
| tree | 626dd6df98cae5d119fea0852d5fce67b6f73b89 /net | |
| parent | 808d86f23f857721b310cfeba18884d2bb0f5301 (diff) | |
| parent | e7c96bffc79157264598df0a293003a08d12da89 (diff) | |
| download | prosody-1d911dd1d1983c0a2fc604f99f26e76a19b361db.tar.gz prosody-1d911dd1d1983c0a2fc604f99f26e76a19b361db.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions