aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-15 10:48:11 +0200
committerKim Alvefur <zash@zash.se>2013-10-15 10:48:11 +0200
commit75aefae1a9bf676ddf59d571ba0e55098298509f (patch)
treefe9b8ddc6deba4135441975ae2d3f6af34d7248a /plugins
parent243b96a44040e06cc7164d6fe96b48da8ae23388 (diff)
parent4c2ea20af4ca9ea1136a83863bd9b7d2a8469f3f (diff)
downloadprosody-75aefae1a9bf676ddf59d571ba0e55098298509f.tar.gz
prosody-75aefae1a9bf676ddf59d571ba0e55098298509f.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions