aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 17:10:42 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 17:10:42 +0200
commitfff25bc9b5828f3b5dd8fca6e5cd05b04feb2cf9 (patch)
tree63c64dc8427c6d987cd53d489e228d097b87612f /net
parent8a4e25d8a8360b82f8c7431be8babaa87e95b454 (diff)
parentacd12fcc61d2e0a23db0b938fbb0ed0215f86c11 (diff)
downloadprosody-fff25bc9b5828f3b5dd8fca6e5cd05b04feb2cf9.tar.gz
prosody-fff25bc9b5828f3b5dd8fca6e5cd05b04feb2cf9.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions