diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-03-18 01:44:55 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-03-18 01:44:55 +0000 |
commit | 96423a139c18caacf5c18bbc3d8536b3528eac28 (patch) | |
tree | 5995fd34e5532c2ef8566083cdc72ce7e4d84305 /doc | |
parent | 67e1ec2f26912f934b7c6900d4d9669b33de1a36 (diff) | |
parent | f858b0f2589934bd1edd03ff463932f1f4f2dfbf (diff) | |
download | prosody-96423a139c18caacf5c18bbc3d8536b3528eac28.tar.gz prosody-96423a139c18caacf5c18bbc3d8536b3528eac28.zip |
Merge 0.7->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions