aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-11-23 01:51:53 +0100
committerKim Alvefur <zash@zash.se>2012-11-23 01:51:53 +0100
commit6896ddaea37097cf8252f94750f3a57c29ded584 (patch)
tree435a265cd55603c63669c3d498ba7cbaac4f9bd0 /core
parent97123dfead3682296982ba4ff194c46e415165d1 (diff)
parent6890dbd62f8dd36799ef6f17579729b95c57e015 (diff)
downloadprosody-6896ddaea37097cf8252f94750f3a57c29ded584.tar.gz
prosody-6896ddaea37097cf8252f94750f3a57c29ded584.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions