aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-05-26 16:02:01 +0200
committerKim Alvefur <zash@zash.se>2013-05-26 16:02:01 +0200
commitcc88321c964ed69fcd619af590b0faf28dd093ab (patch)
tree035cdd418eff713bd33114630d1c6bdb5991fde1 /prosody
parent421bdc43997ee9215ce57ee73616f90ce695f601 (diff)
parent4a8d033ca18c843418066d7b1d3f0a7a1fc00f42 (diff)
downloadprosody-cc88321c964ed69fcd619af590b0faf28dd093ab.tar.gz
prosody-cc88321c964ed69fcd619af590b0faf28dd093ab.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions