diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-28 19:27:13 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-28 19:27:13 +0100 |
| commit | ffc455a307546e590923e3df6848bec2bc8fce17 (patch) | |
| tree | 7f984e40e2046c1e5531857f92b671bd4dea3bb2 /core | |
| parent | 6f31f27a762f5f0bda723059e2dfa4c77aadb438 (diff) | |
| parent | e5cf84bdcdae02d49a983d210e7d02409ff28b70 (diff) | |
| download | prosody-ffc455a307546e590923e3df6848bec2bc8fce17.tar.gz prosody-ffc455a307546e590923e3df6848bec2bc8fce17.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions