diff options
| author | Kim Alvefur <zash@zash.se> | 2017-02-14 23:42:11 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-02-14 23:42:11 +0100 |
| commit | bd92525bf197b524edd4716f5c0a2773d54c5aa7 (patch) | |
| tree | 2b8a5826f55d17228f3c87145bc37f798272f98c /net | |
| parent | 594cd2890617a6472ba44b5146cf613d97a72b26 (diff) | |
| parent | 293402a3388b91bbb51d0043718cca5a3e822f06 (diff) | |
| download | prosody-bd92525bf197b524edd4716f5c0a2773d54c5aa7.tar.gz prosody-bd92525bf197b524edd4716f5c0a2773d54c5aa7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions