diff options
| author | Kim Alvefur <zash@zash.se> | 2014-07-09 02:06:37 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-07-09 02:06:37 +0200 |
| commit | 663261871fffe8f4021e86a4b43be5f4c2331795 (patch) | |
| tree | 0711b5f60f7a08ce1aa08b944317eb471f532782 /net | |
| parent | bfd2c5fee05474008a1b5df153ed42f00fe16222 (diff) | |
| parent | 84b23d1546d1fc76ba603bbe1d89d9a35e24b6de (diff) | |
| download | prosody-663261871fffe8f4021e86a4b43be5f4c2331795.tar.gz prosody-663261871fffe8f4021e86a4b43be5f4c2331795.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions