diff options
| author | Kim Alvefur <zash@zash.se> | 2014-04-10 13:16:54 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-04-10 13:16:54 +0200 |
| commit | a415748985aa2ec998caabb5baf1d7f083d6076a (patch) | |
| tree | 521b9634144ac84ea608dbe47a15a0bcd1951695 /net | |
| parent | eae27a73d7439930ebe9732d72b14c795b17c528 (diff) | |
| parent | b9751f2455a3a7a72c2505d3fc8296ee722726cc (diff) | |
| download | prosody-a415748985aa2ec998caabb5baf1d7f083d6076a.tar.gz prosody-a415748985aa2ec998caabb5baf1d7f083d6076a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions