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