diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-05-29 22:06:21 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-05-29 22:06:21 +0100 |
commit | 820e322c2a64bc0162d45e32c287497336ea1314 (patch) | |
tree | 681720876857fb4fe3514de7c217464dbdde7ba6 /core | |
parent | 66e22f3c576fcb4666a0eb8156015cdd2bb79e2c (diff) | |
parent | 0d7aa536d5b382f9d2eb3a2f725ebd038ec97284 (diff) | |
download | prosody-820e322c2a64bc0162d45e32c287497336ea1314.tar.gz prosody-820e322c2a64bc0162d45e32c287497336ea1314.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions