aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-21 09:04:54 +0100
committerKim Alvefur <zash@zash.se>2012-12-21 09:04:54 +0100
commit1d1efd975193cd7d8f0bb221b9bedba3a50d9065 (patch)
treeb63e4c7674e6bd896bb1e663922f1afb3ebbd710 /prosody
parent1490ee897db6e52f06b907582ebdad8feba4816d (diff)
parent5c0e25da68b8fe6b4ca70d1f6b85ef5de3fc2ced (diff)
downloadprosody-1d1efd975193cd7d8f0bb221b9bedba3a50d9065.tar.gz
prosody-1d1efd975193cd7d8f0bb221b9bedba3a50d9065.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions