diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-21 19:28:56 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-21 19:28:56 +0100 |
| commit | 580fa6432e13f0625bc85956c36ee52f92d8dfbd (patch) | |
| tree | aa79224d25f83a3a7b7b3a8c2cc79eedc501ebb7 /core | |
| parent | 5cba72527ed1697d41af3615b3ff48f6e541fc62 (diff) | |
| parent | a7048b7c938909b1fc915823b2963ae0dfcf1203 (diff) | |
| download | prosody-580fa6432e13f0625bc85956c36ee52f92d8dfbd.tar.gz prosody-580fa6432e13f0625bc85956c36ee52f92d8dfbd.zip | |
Merge 0.7->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions