diff options
author | Kim Alvefur <zash@zash.se> | 2014-08-09 21:48:52 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-08-09 21:48:52 +0200 |
commit | 8bbf7d4e1f76626a4859167500b5bf287ef3a2c6 (patch) | |
tree | 24154d31350e9324ccd72bdbc2e102bb48fa13cc /core | |
parent | edd380b6cd178d2b0eb11b44c659874420393e4c (diff) | |
parent | 503aba403d99eeedf2cc8ebb6c7df50e983f538d (diff) | |
download | prosody-8bbf7d4e1f76626a4859167500b5bf287ef3a2c6.tar.gz prosody-8bbf7d4e1f76626a4859167500b5bf287ef3a2c6.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions