diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-03 23:49:15 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-03 23:49:15 +0200 |
commit | 4db1bdfc87c6f56610c0e0f4732cca7ff1302efa (patch) | |
tree | 00d541185816de24e7a9b1c8e9fa773bd53f8b8f /doc | |
parent | 2c628cc4bac167e28a476931b77ba9185e38e793 (diff) | |
parent | e1d1102f5e3e6a6e2f738c710443d0f1b17a918b (diff) | |
download | prosody-4db1bdfc87c6f56610c0e0f4732cca7ff1302efa.tar.gz prosody-4db1bdfc87c6f56610c0e0f4732cca7ff1302efa.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions