aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-03-01 06:14:03 +0000
committerMatthew Wild <mwild1@gmail.com>2011-03-01 06:14:03 +0000
commit2c29bb6f6ac3db2cf94aca7cd827a586db2ad497 (patch)
tree5efe93da0996685cbafa67d38a9bedad79b7f7d4 /prosody
parent65f5ac4f58a596f9a6813572171625095b685cee (diff)
parent9cf13e5dcd6844be8be5260caa855743c4d94227 (diff)
downloadprosody-2c29bb6f6ac3db2cf94aca7cd827a586db2ad497.tar.gz
prosody-2c29bb6f6ac3db2cf94aca7cd827a586db2ad497.zip
Merge 0.8->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions