diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-17 18:08:44 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-17 18:08:44 +0100 |
commit | c08a9c7d78063b4632f54468d3d3a0cbf0a1f204 (patch) | |
tree | 716fb68621be4bcfe9fdb1a11637c9ba21b29f6f | |
parent | 33fd7699b83e752b83d1bee24eaf8e290c11b88b (diff) | |
parent | 379b127825254207f3163b6c2a00e0676fd6a136 (diff) | |
download | prosody-c08a9c7d78063b4632f54468d3d3a0cbf0a1f204.tar.gz prosody-c08a9c7d78063b4632f54468d3d3a0cbf0a1f204.zip |
Merge 0.10->trunk
0 files changed, 0 insertions, 0 deletions