aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2010-06-08 20:39:27 +0200
committerTobias Markmann <tm@ayena.de>2010-06-08 20:39:27 +0200
commit9184608dec00737844498068a4541a4e0238acc8 (patch)
treec6e48d08ed6b48f88d8e90f1f38ddb54b1a8f013 /core
parent9cbe1a37424c67bdaf451c78ba1fe298bac9ac2b (diff)
parentc04a3c71c768073944d533ea408b896bfca0d643 (diff)
downloadprosody-9184608dec00737844498068a4541a4e0238acc8.tar.gz
prosody-9184608dec00737844498068a4541a4e0238acc8.zip
Merge with tip.
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions