aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-21 16:43:05 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-21 16:43:05 +0000
commit551d3cf7b732bc5c6a0ce86c8875bedf0badc39b (patch)
tree3fc1c6e90de4dc703778892e775e9b7e3a6ac9b2 /core
parent8f7e7b390d6c621e6ca51a9d17cf75a5a3c1802c (diff)
parentc77b61bfe49ef0776f63a4d5b9dec2bc329965f0 (diff)
downloadprosody-551d3cf7b732bc5c6a0ce86c8875bedf0badc39b.tar.gz
prosody-551d3cf7b732bc5c6a0ce86c8875bedf0badc39b.zip
Merge with 0.7
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions