aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-04-26 00:07:36 +0200
committerKim Alvefur <zash@zash.se>2015-04-26 00:07:36 +0200
commit43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3 (patch)
treeb003c23950a3bb53f56cc0eedaca77b2aaf4bbe0 /prosody
parent1be7952fe226feefa784e1975d23e950323877e3 (diff)
parent3e6b35b5d49b5f6ec06cb301ba7b4cbce0a75000 (diff)
downloadprosody-43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3.tar.gz
prosody-43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions