diff options
author | Tobias Markmann <tm@ayena.de> | 2008-11-30 17:18:31 +0100 |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2008-11-30 17:18:31 +0100 |
commit | e18e2e4b2dd9febe59224ea9a58e0ee1cbbbb80b (patch) | |
tree | 7f7e46548c10d40a1843c13580c827725fc47aa1 /core | |
parent | 81ff9d3a9fbaff5893deeacc854c25b61d3f6106 (diff) | |
parent | 8932fbc85ca4a43bba31099569bb579c6a803f22 (diff) | |
download | prosody-e18e2e4b2dd9febe59224ea9a58e0ee1cbbbb80b.tar.gz prosody-e18e2e4b2dd9febe59224ea9a58e0ee1cbbbb80b.zip |
Automerge with waqas.
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions