diff options
| author | Kim Alvefur <zash@zash.se> | 2015-05-05 01:34:20 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-05-05 01:34:20 +0200 |
| commit | 83049e63c621c66da5129449f3a610df2e74ce38 (patch) | |
| tree | 0d7008e74a3ae1c6dd45d705691566a9a685d2f7 /doc | |
| parent | 8896368c298dc1d009dc56b38919e02b35f3214d (diff) | |
| parent | 143926f0a877edff6f91f4820215a24f4edfc69a (diff) | |
| download | prosody-83049e63c621c66da5129449f3a610df2e74ce38.tar.gz prosody-83049e63c621c66da5129449f3a610df2e74ce38.zip | |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions