diff options
| author | Kim Alvefur <zash@zash.se> | 2014-07-04 23:05:27 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-07-04 23:05:27 +0200 |
| commit | 470aca805a23e9483bacd3a9864295c1baecbd65 (patch) | |
| tree | 41f4db74c0b05563f71d07478a4d8b3c106359af /net | |
| parent | e747fa644137819e46e444b8ca605c727fa64d97 (diff) | |
| parent | c09c7687017547b4fcff673e80944ea5d5167853 (diff) | |
| download | prosody-470aca805a23e9483bacd3a9864295c1baecbd65.tar.gz prosody-470aca805a23e9483bacd3a9864295c1baecbd65.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions