diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-04-09 12:31:51 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-04-09 12:31:51 +0100 |
commit | c802b22a8bb05ab6b9644c1c722bb06b7b16a0ee (patch) | |
tree | 4e5db102fe2aee88c31df95747f2da882b05a2b5 /doc | |
parent | 90116b3c354d4c48b65e1fb66074e3329bbf4fe0 (diff) | |
parent | 6778955731063d37b1de314384f002ce4509fd2e (diff) | |
download | prosody-c802b22a8bb05ab6b9644c1c722bb06b7b16a0ee.tar.gz prosody-c802b22a8bb05ab6b9644c1c722bb06b7b16a0ee.zip |
Merge 0.6->0.7
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions