diff options
| author | Kim Alvefur <zash@zash.se> | 2015-09-17 22:15:26 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-09-17 22:15:26 +0200 |
| commit | ca680c0562f7ad2b3754a65481f2a3196825f62e (patch) | |
| tree | aae43eb039122cfd152c9a26e2f40154cad08440 /core | |
| parent | 9b46c7aba5e4d842fffbfc4a1e96371ad06e63a1 (diff) | |
| parent | 7774f56dfc98b7192e9f9c0b32b070a2949f3113 (diff) | |
| download | prosody-ca680c0562f7ad2b3754a65481f2a3196825f62e.tar.gz prosody-ca680c0562f7ad2b3754a65481f2a3196825f62e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions