diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-03-04 18:48:29 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-03-04 18:48:29 +0000 |
commit | 2509fd597845eeedd3d66a13105a6d958ba68e8d (patch) | |
tree | 5478a01a794cf9253fcdde2aea2bc1a72b395e0e /prosody | |
parent | 25a18ce239d4a7e342d6c7087c575555ef3a27bd (diff) | |
parent | 617476f5fdef51459e5032cb0001ad2b0ed1afd1 (diff) | |
download | prosody-2509fd597845eeedd3d66a13105a6d958ba68e8d.tar.gz prosody-2509fd597845eeedd3d66a13105a6d958ba68e8d.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions