aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-23 12:19:23 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-23 12:19:23 +0000
commit5aed00374715e5ca0149888dcd0df88291015809 (patch)
tree19bbee1ddaa22369aec0f6558391969263a27aa2 /prosody
parent977314dc5ab03c9fb03ad59932b674a25f71ccff (diff)
parentc50a32df40853786330503ea52ffea6c040a212b (diff)
downloadprosody-5aed00374715e5ca0149888dcd0df88291015809.tar.gz
prosody-5aed00374715e5ca0149888dcd0df88291015809.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions