diff options
author | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
commit | 1929113b7830954ae60ad49934b3c16bf746a9ba (patch) | |
tree | a1d3fc24abd3048cb23d45b860640a83baa8c261 /net | |
parent | 0f2d3d7139c741b6bd8714048694ee16a9b11c91 (diff) | |
parent | 5cfdac70c61ae6562f72868ef7b55129b166aa80 (diff) | |
download | prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.tar.gz prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.zip |
Merge 0.9->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions