diff options
author | Kim Alvefur <zash@zash.se> | 2012-12-15 05:34:30 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2012-12-15 05:34:30 +0100 |
commit | 0197a4d854394ae820f72d561482936428e51272 (patch) | |
tree | fc2c8b6bbbc983b20cab69ef02c7da19bb9b7709 /doc | |
parent | afef23ee7e4fb91436f8a07c1cfa6cc876126abb (diff) | |
parent | 1d8297ca4f2e491fa3e3cf5f3416337f19d31e7c (diff) | |
download | prosody-0197a4d854394ae820f72d561482936428e51272.tar.gz prosody-0197a4d854394ae820f72d561482936428e51272.zip |
Merge
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions