aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-12 19:26:22 +0100
committerKim Alvefur <zash@zash.se>2014-02-12 19:26:22 +0100
commita8479fce152379d3e095aa0204aa022c5b47d4e0 (patch)
tree32c8de1b1bd02761e9b058e38b71d78871078c54 /core
parent4078dc07a2a867aa7e7f010c63a9a85b52c433ee (diff)
parentbc6f1c6085f6e248acefa7dd110d5f21a262fe8f (diff)
downloadprosody-a8479fce152379d3e095aa0204aa022c5b47d4e0.tar.gz
prosody-a8479fce152379d3e095aa0204aa022c5b47d4e0.zip
Merge 0.9 -> 0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions