aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-17 18:04:43 +0100
committerKim Alvefur <zash@zash.se>2016-03-17 18:04:43 +0100
commit33fd7699b83e752b83d1bee24eaf8e290c11b88b (patch)
tree716fb68621be4bcfe9fdb1a11637c9ba21b29f6f
parent6cac5f4cc2ba5697e556b6ffd4c2506ff94ddb39 (diff)
parent1d26337ac6fa7981362d413111ed98f64a29144e (diff)
downloadprosody-33fd7699b83e752b83d1bee24eaf8e290c11b88b.tar.gz
prosody-33fd7699b83e752b83d1bee24eaf8e290c11b88b.zip
Merge 0.10->trunk
0 files changed, 0 insertions, 0 deletions