aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-02-18 21:02:41 +0000
committerMatthew Wild <mwild1@gmail.com>2009-02-18 21:02:41 +0000
commitb783d074206a70c3541fb3229ec3b1e20d38cdcf (patch)
treece54a42aefe1b3282d8bacc4c89b2687c555a3ed /core
parentac2f11fb5fbbe8111ce741e4509a73a71442f400 (diff)
parentb916691415f93c89a99fc7d4b62ff43addb0e28f (diff)
downloadprosody-b783d074206a70c3541fb3229ec3b1e20d38cdcf.tar.gz
prosody-b783d074206a70c3541fb3229ec3b1e20d38cdcf.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions