aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 17:32:22 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 17:32:22 +0200
commit277ee1b09d77a1e1dde4e6983e36d0c240956528 (patch)
tree5b7865a9092e735c09169b654f9bbe1382ccb16a /prosody
parentfff25bc9b5828f3b5dd8fca6e5cd05b04feb2cf9 (diff)
parentee3e8bbd38974e1c5c788b06e9002af7eb02fed3 (diff)
downloadprosody-277ee1b09d77a1e1dde4e6983e36d0c240956528.tar.gz
prosody-277ee1b09d77a1e1dde4e6983e36d0c240956528.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions