diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-20 10:48:44 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-20 10:48:44 +0100 |
| commit | 00bad4452993f5d32e41bcfdf69647fd81f0d70a (patch) | |
| tree | b4ab52ae4cf8453ce60f8962ea1cfe066671019f /prosody | |
| parent | fd55f81b12c7cda5896b65fa4375480e91a1e7dd (diff) | |
| parent | f2b14d6d07c54889e1ece23b3fd10f348526be45 (diff) | |
| download | prosody-00bad4452993f5d32e41bcfdf69647fd81f0d70a.tar.gz prosody-00bad4452993f5d32e41bcfdf69647fd81f0d70a.zip | |
Merge 0.7->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions