aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-04-07 21:01:06 +0100
committerMatthew Wild <mwild1@gmail.com>2010-04-07 21:01:06 +0100
commit27459fad4ba2e40ad09552b61d695dce2f113d40 (patch)
treec3b8063b9bd334257b09213015fb422c2db35db6 /core
parente0b8ae73c0c3d432aafa5a94b256442e55395ad5 (diff)
parent90116b3c354d4c48b65e1fb66074e3329bbf4fe0 (diff)
downloadprosody-27459fad4ba2e40ad09552b61d695dce2f113d40.tar.gz
prosody-27459fad4ba2e40ad09552b61d695dce2f113d40.zip
Merge 0.7->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions