aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-13 16:12:53 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-13 16:12:53 +0000
commitbb996f5317b1df04976ee5927826ce20ced9a4f0 (patch)
tree9c366d3d68222aa25542ed0092ec1631cef977e9 /prosody
parent9d36af9159bff39bf5d76f2347914d0fd7479cb2 (diff)
parentf6063e31eba234344afe0c2c2d81578ce726ff3c (diff)
downloadprosody-bb996f5317b1df04976ee5927826ce20ced9a4f0.tar.gz
prosody-bb996f5317b1df04976ee5927826ce20ced9a4f0.zip
Merge with 0.7
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions