aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-11-25 03:30:41 +0000
committerMatthew Wild <mwild1@gmail.com>2009-11-25 03:30:41 +0000
commitfc220d6217b14bb08eb59dd50b5e8319f63a3290 (patch)
tree13b8d9deb5a736dd276140f09ca7487b97b9eda2 /prosody
parent23a0480d9b9bed9d4e115cecf64d7e6ab377c05c (diff)
parentc4742ed7810b3e10bfc6bdb55a11c31b3faf5426 (diff)
downloadprosody-fc220d6217b14bb08eb59dd50b5e8319f63a3290.tar.gz
prosody-fc220d6217b14bb08eb59dd50b5e8319f63a3290.zip
Merge with 0.6
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions