aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authormatthew <matthew@silver>2008-08-24 18:08:04 +0100
committermatthew <matthew@silver>2008-08-24 18:08:04 +0100
commit25f82f43ad92f190e2373f0e61524bee826617b2 (patch)
tree1285f7cc14c92306dab94b104648dd1747812069 /core
parent5ea14b62950a6a9cbdc96c7354afddcf637d9d41 (diff)
parentdfe21804fe9558ac19d2327d2cf4ed16267bc3fc (diff)
downloadprosody-25f82f43ad92f190e2373f0e61524bee826617b2.tar.gz
prosody-25f82f43ad92f190e2373f0e61524bee826617b2.zip
Merged 2 heads o_O
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions