diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-20 09:41:27 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-20 09:41:27 +0100 |
| commit | 73f5f90003e011e3da0836a596ba5534469adef5 (patch) | |
| tree | ac3288eee86f7542c56d9ed195a5a2ca38b52c23 /core | |
| parent | 226d0936b3ede43be6319474a9eb905dbe8fbc60 (diff) | |
| parent | 5c7c2e522d9683eef84b03d40209361f4171b39c (diff) | |
| download | prosody-73f5f90003e011e3da0836a596ba5534469adef5.tar.gz prosody-73f5f90003e011e3da0836a596ba5534469adef5.zip | |
Merge 0.7->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions