aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-02-18 19:34:26 +0000
committerMatthew Wild <mwild1@gmail.com>2009-02-18 19:34:26 +0000
commitb916691415f93c89a99fc7d4b62ff43addb0e28f (patch)
treef7bdc18bb6929e58cecb610dc884805a7b7dcd78 /core
parentb964df3b328d3b83dc5e466dcb666c40198a19cc (diff)
parent8433494e21252423c4395f7e920c16923e44ce0a (diff)
downloadprosody-b916691415f93c89a99fc7d4b62ff43addb0e28f.tar.gz
prosody-b916691415f93c89a99fc7d4b62ff43addb0e28f.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions