aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-06-04 18:38:35 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-06-04 18:38:35 +0500
commitbd5eb28b327232a6a016012368905f02a3f3be36 (patch)
tree65f01a2d0266c9db3cd0c715990c59071e8b32f1 /prosody
parent5f4b882a7769e4468d35930b1b8638824584fdab (diff)
parent3846f08f09defece7a04ef3e68b3843f5a206c08 (diff)
downloadprosody-bd5eb28b327232a6a016012368905f02a3f3be36.tar.gz
prosody-bd5eb28b327232a6a016012368905f02a3f3be36.zip
Merge with trunk.
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions