aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-05-15 20:38:30 +0100
committerMatthew Wild <mwild1@gmail.com>2009-05-15 20:38:30 +0100
commit77798443db633a40446a30be5e4ad5c568ef005d (patch)
tree7e8cbe6ffc57aafd2270b9099a31bebcd78d0bb4 /net
parent676ae568df3d5fd651408654c1f11d09b5528a2a (diff)
parent672ffb89624c3af6badb7354a6bcd9c0d7624e48 (diff)
downloadprosody-77798443db633a40446a30be5e4ad5c568ef005d.tar.gz
prosody-77798443db633a40446a30be5e4ad5c568ef005d.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions