aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-05-06 17:14:11 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-05-06 17:14:11 +0500
commitcd44ab86cdaff0a39119a9e750f74bb172972475 (patch)
tree606859b5659d850d800c566536e6a38cc5bafe66 /prosody
parent6c0bf0ebbeedf0d1a186b6bd178731d00671200f (diff)
parent9c6d61718a10ced453e73639566785ae292b0b47 (diff)
downloadprosody-cd44ab86cdaff0a39119a9e750f74bb172972475.tar.gz
prosody-cd44ab86cdaff0a39119a9e750f74bb172972475.zip
Merge 0.7->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions