aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2008-11-29 20:33:14 +0100
committerTobias Markmann <tm@ayena.de>2008-11-29 20:33:14 +0100
commitf4b87362d1de049c4ad1b7d22bb91f3dc0a94c43 (patch)
treedfa6d7e6f11ffd124bd8f4393684b24e39e22c30 /core
parentf39b9177c92385836bf216a459b159784a98ce23 (diff)
parent354c65daa0bc974297c0dcaac769dd63725ba4e1 (diff)
downloadprosody-f4b87362d1de049c4ad1b7d22bb91f3dc0a94c43.tar.gz
prosody-f4b87362d1de049c4ad1b7d22bb91f3dc0a94c43.zip
Automated merge.
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions