diff options
| author | Kim Alvefur <zash@zash.se> | 2015-04-05 15:22:33 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-04-05 15:22:33 +0200 |
| commit | 289dae62f86a64943ace04beb972e13eaab8f50f (patch) | |
| tree | d3159081b883ccf8010593d5f882982116322e22 /net | |
| parent | 9ba4eef47c2806af0323f8ee215acfa16e49df57 (diff) | |
| parent | 17e942c4dc0d1afa484d07c1279ca7d5446ea6e9 (diff) | |
| download | prosody-289dae62f86a64943ace04beb972e13eaab8f50f.tar.gz prosody-289dae62f86a64943ace04beb972e13eaab8f50f.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions