aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-05 16:31:34 +0100
committerKim Alvefur <zash@zash.se>2016-02-05 16:31:34 +0100
commitd2f663f5daae1b6d720d8ed0e9bf847dde07adb6 (patch)
tree6815ba825d7158b632e3a9713842575d40d20e9a /prosody
parentceb159bd90ebeeeb8d17ffde84c4ae799a5079e4 (diff)
parente70cd52ed93921f41ed4d2fe1cf1f4457700554a (diff)
downloadprosody-d2f663f5daae1b6d720d8ed0e9bf847dde07adb6.tar.gz
prosody-d2f663f5daae1b6d720d8ed0e9bf847dde07adb6.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions