aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-19 01:05:36 +0100
committerKim Alvefur <zash@zash.se>2016-11-19 01:05:36 +0100
commitda42ca2167a2051d2fa85400be3ce0f516909704 (patch)
tree10c5a2294941641099a92c40f24081bcf121cd8f /prosody
parent59e7a632af33944016e3cbdb8a787a82188314ba (diff)
parent383aa66ca845f5f85684f9a30f8bc0933513fe98 (diff)
downloadprosody-da42ca2167a2051d2fa85400be3ce0f516909704.tar.gz
prosody-da42ca2167a2051d2fa85400be3ce0f516909704.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions