diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-03 03:35:48 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-03 03:35:48 +0200 |
| commit | 11b80ad0441bc379164d55852032ab7feb2631c0 (patch) | |
| tree | eb16a84bc3a9041200e866318d17edf87c1af0ae /net | |
| parent | c47fa42628b2119f7e37e83f22919bc905a53624 (diff) | |
| parent | 11af743ec1ac3de3264c6f6aa5e71a6544b3f91c (diff) | |
| download | prosody-11b80ad0441bc379164d55852032ab7feb2631c0.tar.gz prosody-11b80ad0441bc379164d55852032ab7feb2631c0.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions