diff options
author | Kim Alvefur <zash@zash.se> | 2016-07-13 18:43:33 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-07-13 18:43:33 +0200 |
commit | 50bd70e55fef42f6ec053a0662d39471c59dbde0 (patch) | |
tree | 211c2095c4ed506159c6508b1a901ac0ac56af38 | |
parent | 6aab36d1ad11b6ba9fe66ecbf540028921e745fc (diff) | |
parent | 81dad3807468527bbf97d91e2f47393ffb04924e (diff) | |
download | prosody-50bd70e55fef42f6ec053a0662d39471c59dbde0.tar.gz prosody-50bd70e55fef42f6ec053a0662d39471c59dbde0.zip |
Merge 0.10->trunk
0 files changed, 0 insertions, 0 deletions