diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-02-05 17:46:58 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-02-05 17:46:58 +0000 |
commit | 2baed82b54890013c76d2b3c2cd2e5f283eb5ef2 (patch) | |
tree | d2a6d4dc6f64e06de46241ff3ee0de8472affe17 /net | |
parent | 586c38979c3643041262413ef0f929bfd7f26316 (diff) | |
parent | 4262db951e84928cef57271537508a8ba83482a7 (diff) | |
download | prosody-2baed82b54890013c76d2b3c2cd2e5f283eb5ef2.tar.gz prosody-2baed82b54890013c76d2b3c2cd2e5f283eb5ef2.zip |
Merge with backout
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions