diff options
author | Kim Alvefur <zash@zash.se> | 2013-05-26 22:59:06 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-05-26 22:59:06 +0200 |
commit | bc17d8f64fae69b01a5b27509dffaba8748ce945 (patch) | |
tree | df0a0b0399c45ce7406755d83fcdaa8c7f24b116 /net | |
parent | 3ec0f31581ee93e40f000e883ec0ad1a4e5b480c (diff) | |
parent | a59ace83df2910acc183c64f8ee550c602b8dfa3 (diff) | |
download | prosody-bc17d8f64fae69b01a5b27509dffaba8748ce945.tar.gz prosody-bc17d8f64fae69b01a5b27509dffaba8748ce945.zip |
Merge 0.9->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions