diff options
author | Kim Alvefur <zash@zash.se> | 2017-05-20 15:00:50 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-05-20 15:00:50 +0200 |
commit | 30cd746fdf8e16e49abbcbd80a3d0c0bf619ac67 (patch) | |
tree | a9f889946fe0b378627047ddcff3fe5e45fcc1ff /prosody | |
parent | cdb000e818930f9622ecf4bdacae7a9c6ca80a2f (diff) | |
parent | 06b5c50c4e4751e54ca01175d2898bb88cd84819 (diff) | |
download | prosody-30cd746fdf8e16e49abbcbd80a3d0c0bf619ac67.tar.gz prosody-30cd746fdf8e16e49abbcbd80a3d0c0bf619ac67.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions