diff options
| author | Tobias Markmann <tm@ayena.de> | 2008-11-29 22:11:21 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2008-11-29 22:11:21 +0100 |
| commit | 4bed2a5772a88b0286608d80e154e29487927523 (patch) | |
| tree | a2d57d2dfcbaa4620ef3ea82978911f5006ac2e0 /net | |
| parent | 1e28e938c7c7430ea358490ad167ebfb8c84bb20 (diff) | |
| parent | 48e386d5decd46e79b732ceb643448d2b9659bb4 (diff) | |
| download | prosody-4bed2a5772a88b0286608d80e154e29487927523.tar.gz prosody-4bed2a5772a88b0286608d80e154e29487927523.zip | |
Another automatic merge, this gets annoying."
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions