diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-06-12 22:21:10 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-06-12 22:21:10 +0100 |
commit | b244387ef5d355ed050a7e1cefc1ba9737501d0e (patch) | |
tree | 70bd28066f6e58fb747f43a482ae58e569a84b9e /net | |
parent | d6a4ddca74f7f875f39f48c22318bdcfc3ed6d40 (diff) | |
parent | 61f32b68e1d793245c900772406b039c173d4c0c (diff) | |
download | prosody-b244387ef5d355ed050a7e1cefc1ba9737501d0e.tar.gz prosody-b244387ef5d355ed050a7e1cefc1ba9737501d0e.zip |
Merge 0.8->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions