aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-11-25 19:59:16 +0000
committerMatthew Wild <mwild1@gmail.com>2009-11-25 19:59:16 +0000
commit000870c95ac64d44f148b753daa53bc339aa14bf (patch)
tree96b7d0003dfad5c5cc21913542badd0cf4f82832 /core
parent991fde2f8d36a1b9a42f35c9146650da4ed024e2 (diff)
parente3525bd51bc3c61e9cabf769dbc3ba2c23033332 (diff)
downloadprosody-000870c95ac64d44f148b753daa53bc339aa14bf.tar.gz
prosody-000870c95ac64d44f148b753daa53bc339aa14bf.zip
Merge with trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions