diff options
author | Kim Alvefur <zash@zash.se> | 2014-02-03 07:25:05 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-02-03 07:25:05 +0100 |
commit | 3b3997eef4a3c50a562efe9c49b3a180ab439dbe (patch) | |
tree | c840902603d1482af5f9156d6170461fd47b8e69 /net | |
parent | c891b3fd1d45a2cacbfce1744ebd25828d321810 (diff) | |
parent | 468a94a982d801d63812023fddb40baca2b9ef62 (diff) | |
download | prosody-3b3997eef4a3c50a562efe9c49b3a180ab439dbe.tar.gz prosody-3b3997eef4a3c50a562efe9c49b3a180ab439dbe.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions