aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-04-03 23:09:11 +0100
committerMatthew Wild <mwild1@gmail.com>2010-04-03 23:09:11 +0100
commit89e9f18d2ac62feb42a56a87ef0836a886da5d76 (patch)
treeace0eeab3ed6610204951f2ef1c60b23caeb36d8 /prosody
parent3dbf4c9e57cec2baa98f8864263a3cd11d608707 (diff)
parent1b43f0146e5de1245f6bcbd4b4e0fbd2f513b863 (diff)
downloadprosody-89e9f18d2ac62feb42a56a87ef0836a886da5d76.tar.gz
prosody-89e9f18d2ac62feb42a56a87ef0836a886da5d76.zip
Merge 0.6->0.7
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions