aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-11-09 18:36:32 +0000
committerMatthew Wild <mwild1@gmail.com>2013-11-09 18:36:32 +0000
commit85289e8c7d1f592a65ba13d1c117d34cefc6e3ad (patch)
treeb2c5bd41f4b82635ecf2b2191687ff0f14bfb246 /net
parent77355bc935b956f173dc290273f6eda0a1f69360 (diff)
parent84ab7c5628a4c0bbb59a22250452c20c3677adc4 (diff)
downloadprosody-85289e8c7d1f592a65ba13d1c117d34cefc6e3ad.tar.gz
prosody-85289e8c7d1f592a65ba13d1c117d34cefc6e3ad.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions