aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-07-04 15:54:37 +0200
committerKim Alvefur <zash@zash.se>2014-07-04 15:54:37 +0200
commit43a760cd9330b1ebd6a6c7d1c95116ccd752655c (patch)
tree5be1c4d561dcc594ea462b18259d5532b4ec900a
parent93e9f09839263ce2c43c28f7d2b1c218f9935abb (diff)
parent9398ba77f3a9abf825b3e7b4e57c4a0d1252a106 (diff)
downloadprosody-43a760cd9330b1ebd6a6c7d1c95116ccd752655c.tar.gz
prosody-43a760cd9330b1ebd6a6c7d1c95116ccd752655c.zip
Merge 0.9->0.10
0 files changed, 0 insertions, 0 deletions