aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-11-24 20:35:18 +0000
committerMatthew Wild <mwild1@gmail.com>2009-11-24 20:35:18 +0000
commit23a0480d9b9bed9d4e115cecf64d7e6ab377c05c (patch)
tree77439722f12aa2d49befa131363b6fca01375078 /core
parentf5afdcb5642fb5260717613cc7909e20805a957c (diff)
parent3d08f189a3c6b83515273e99d7dca72693b8971a (diff)
downloadprosody-23a0480d9b9bed9d4e115cecf64d7e6ab377c05c.tar.gz
prosody-23a0480d9b9bed9d4e115cecf64d7e6ab377c05c.zip
Merge with trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions