aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2009-11-19 17:53:52 +0100
committerTobias Markmann <tm@ayena.de>2009-11-19 17:53:52 +0100
commit55df1de9bdfac703203e5659bb7cf172760ef484 (patch)
treee65da676bceabba8ad622a2b6d3c28b8f5d0953a /core
parent315e7ac799abb96f627be4c5b27648f007b89be7 (diff)
parent4cac67d580f99530cd401f4b9b7e7f2036697ada (diff)
downloadprosody-55df1de9bdfac703203e5659bb7cf172760ef484.tar.gz
prosody-55df1de9bdfac703203e5659bb7cf172760ef484.zip
Merge with trunk.
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions