diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-03-15 03:18:33 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-03-15 03:18:33 +0000 |
commit | ed5b64df222bf1e7abc5aa7801f387f090ad2214 (patch) | |
tree | 9a83b9236b92ccbe0ad8d9277bcc565966b39be3 /doc | |
parent | 456cd9c62a173637f18d2c613e3514919369ad90 (diff) | |
parent | 2650d367fa08e67a0a1f6cfbaaebf5fd3221ecd6 (diff) | |
download | prosody-ed5b64df222bf1e7abc5aa7801f387f090ad2214.tar.gz prosody-ed5b64df222bf1e7abc5aa7801f387f090ad2214.zip |
Merge with 0.7 (and indirectly 0.6.2)
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions