aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-03 07:23:33 +0100
committerKim Alvefur <zash@zash.se>2014-02-03 07:23:33 +0100
commitc92bbefd9c5e36913afe0d796a84df180faaf0af (patch)
tree8f9e7c6a07ec34aa279eca57118f12972e1b10f7 /core
parentc5c7ef5b0f47d1e51117f756420176f1f0a2466d (diff)
parent6712a420669b560523170bedbe03f13ee941c52e (diff)
downloadprosody-c92bbefd9c5e36913afe0d796a84df180faaf0af.tar.gz
prosody-c92bbefd9c5e36913afe0d796a84df180faaf0af.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions