aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-06-21 15:05:52 +0200
committerKim Alvefur <zash@zash.se>2014-06-21 15:05:52 +0200
commit2d5b25a9375156bba8b3ffa97a95b9cb2fe35a9d (patch)
treeb2f59bdc9faeaf18b51e6b13f3b78a625c8a7510 /net
parent3a09673e61b5d394fcade54e8e09dadcc840fdb0 (diff)
parent265b49cc49438767327fc3468561a4fbcf484fe0 (diff)
downloadprosody-2d5b25a9375156bba8b3ffa97a95b9cb2fe35a9d.tar.gz
prosody-2d5b25a9375156bba8b3ffa97a95b9cb2fe35a9d.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions