aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/adhoc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-04-26 16:25:17 +0100
committerMatthew Wild <mwild1@gmail.com>2012-04-26 16:25:17 +0100
commit1e12e0070326cb85095bd48c932c70d975928f95 (patch)
tree860acbb782aa41c41e784e9e2b24cddc760392b2 /plugins/adhoc
parent9db4ba52f9cbab52721ed819e4e81f3cbd62d106 (diff)
parentec56b1a798e4a91ce5beaeeeee5d45847cd38a31 (diff)
downloadprosody-1e12e0070326cb85095bd48c932c70d975928f95.tar.gz
prosody-1e12e0070326cb85095bd48c932c70d975928f95.zip
Merge with backout
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions