diff options
| author | Kim Alvefur <zash@zash.se> | 2015-10-02 12:13:32 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-10-02 12:13:32 +0200 |
| commit | 6867b873ba4863cbcefc937611a1e1233caac550 (patch) | |
| tree | fdbe2b55e4c4f871de4fc6cb9aa004e0da258221 /prosody | |
| parent | 0e4e770687183e78e70ea16d056c039062b3708f (diff) | |
| parent | 387a36c6fa8e8810ffb75d6ce850ff569040a9f4 (diff) | |
| download | prosody-6867b873ba4863cbcefc937611a1e1233caac550.tar.gz prosody-6867b873ba4863cbcefc937611a1e1233caac550.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions