aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-04-05 14:38:08 +0100
committerMatthew Wild <mwild1@gmail.com>2011-04-05 14:38:08 +0100
commitdc08b9834f4d9e00a204fe00b9e547924e0908e5 (patch)
tree59ee455eed836439659c9f0fe7840831cbee4100 /core
parent8c9d841c3d81694d063bd931dbfee0634f53e8f7 (diff)
parentc1e4f6fbdabf5fb3569498877647200daaa6867f (diff)
downloadprosody-dc08b9834f4d9e00a204fe00b9e547924e0908e5.tar.gz
prosody-dc08b9834f4d9e00a204fe00b9e547924e0908e5.zip
Merge 0.8 -> trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions