aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-08-09 16:03:48 +0200
committerKim Alvefur <zash@zash.se>2013-08-09 16:03:48 +0200
commit96ec63e3c3bbd7e5f6056a5eeeaaa292b4b4da8d (patch)
treefc6a25f3e3d479e2f2653002fdb120e9a4676ffb /core
parent53836024291aa7c72bee8e2437648d3eb114f5cc (diff)
parenta6f6a0568fa43f0f4b5ed820f22cdf97deafd63b (diff)
downloadprosody-96ec63e3c3bbd7e5f6056a5eeeaaa292b4b4da8d.tar.gz
prosody-96ec63e3c3bbd7e5f6056a5eeeaaa292b4b4da8d.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions