diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-04-15 00:12:32 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-04-15 00:12:32 +0100 |
commit | 87b05e1fa0b928864f618f6a06d0f1f7eee75042 (patch) | |
tree | 29cfb4691c8d107a3ac32ea374edd3b4270cd1e0 /core | |
parent | 6857f81a91e1368f8ec4280af4e64b2169e3cbb7 (diff) | |
parent | 0e6845438050b93130971ba5d2f95ec481887178 (diff) | |
download | prosody-87b05e1fa0b928864f618f6a06d0f1f7eee75042.tar.gz prosody-87b05e1fa0b928864f618f6a06d0f1f7eee75042.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions