aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2008-11-29 22:11:21 +0100
committerTobias Markmann <tm@ayena.de>2008-11-29 22:11:21 +0100
commit4bed2a5772a88b0286608d80e154e29487927523 (patch)
treea2d57d2dfcbaa4620ef3ea82978911f5006ac2e0 /net
parent1e28e938c7c7430ea358490ad167ebfb8c84bb20 (diff)
parent48e386d5decd46e79b732ceb643448d2b9659bb4 (diff)
downloadprosody-4bed2a5772a88b0286608d80e154e29487927523.tar.gz
prosody-4bed2a5772a88b0286608d80e154e29487927523.zip
Another automatic merge, this gets annoying."
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions