diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-28 21:39:14 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-28 21:39:14 +0100 |
| commit | e75e05ebc9f165cc5b297c9c382fa4419e7f270b (patch) | |
| tree | 6c9cf0c2b8ff612f448ee3f99ed5f320126989e2 /prosody | |
| parent | 31b47ca492ba0a844e301085dd530d63f43141e6 (diff) | |
| parent | 47a4bdf758aeec7b0f7e81f498c89ea47088e464 (diff) | |
| download | prosody-e75e05ebc9f165cc5b297c9c382fa4419e7f270b.tar.gz prosody-e75e05ebc9f165cc5b297c9c382fa4419e7f270b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions