aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-06-04 14:08:40 +0100
committerMatthew Wild <mwild1@gmail.com>2010-06-04 14:08:40 +0100
commitc294b198d31be8f2f9448442aad893462ff5e1c5 (patch)
treea3ede71bcc9bdb32d2eb0370829ddac996f33a90 /core
parent396e1061837382d6e15dcb5184491657ffa2e3b8 (diff)
parentfc73419e7ff7542af2ee837ec2eff8e3fea6bbc0 (diff)
downloadprosody-c294b198d31be8f2f9448442aad893462ff5e1c5.tar.gz
prosody-c294b198d31be8f2f9448442aad893462ff5e1c5.zip
Merge trunk/MattJ with trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions