diff options
| author | Kim Alvefur <zash@zash.se> | 2015-05-13 22:33:40 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-05-13 22:33:40 +0200 |
| commit | 068e6374d06f4ba750195da7f6212a1a6ac72636 (patch) | |
| tree | 158e57da633fa8d8553805dcd190a93b767d7f9a /prosody | |
| parent | a885794fccabfc6dc8cc8e52f83c8ac865ddd8c8 (diff) | |
| parent | 6e1bf7233685953e586445fc812c84927b6ae990 (diff) | |
| download | prosody-068e6374d06f4ba750195da7f6212a1a6ac72636.tar.gz prosody-068e6374d06f4ba750195da7f6212a1a6ac72636.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions