diff options
author | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
commit | ccb5e87519070a995cfad8090f517d4273cbeec9 (patch) | |
tree | b18cb027c5578a9efd74e0e4bea0b0d4401abdec /doc | |
parent | eaeb3cfea49d3c4cdfebf7bdd281e5633765e31b (diff) | |
parent | cb8d6cd008a01a8fc7427c9489a2366e17e88a62 (diff) | |
download | prosody-ccb5e87519070a995cfad8090f517d4273cbeec9.tar.gz prosody-ccb5e87519070a995cfad8090f517d4273cbeec9.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions