diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-17 18:08:44 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-17 18:08:44 +0100 |
| commit | b324d49c610e89fb843cd44c4afd52b500cd65b7 (patch) | |
| tree | 716fb68621be4bcfe9fdb1a11637c9ba21b29f6f /prosody | |
| parent | 1121d5eaced1fe90aafe5ce25fda73bbd4779def (diff) | |
| parent | 74f29daa298868c7c34f3e6d9fa5e6c18a296bdb (diff) | |
| download | prosody-b324d49c610e89fb843cd44c4afd52b500cd65b7.tar.gz prosody-b324d49c610e89fb843cd44c4afd52b500cd65b7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions