diff options
author | Matthew Wild <mwild1@gmail.com> | 2008-12-03 19:34:41 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2008-12-03 19:34:41 +0000 |
commit | fd7b0786e552e1a1d8dd978d3526f9ecddfa4f6b (patch) | |
tree | 30ee1a06f2c70b3f6128e7294d07cc6f625740ed /doc/roster_format.txt | |
parent | d2d44b512ba429551e7ce843d64c25be745a8dd5 (diff) | |
parent | 11538c72c66d63aa440373558f36f646a2985ec1 (diff) | |
download | prosody-fd7b0786e552e1a1d8dd978d3526f9ecddfa4f6b.tar.gz prosody-fd7b0786e552e1a1d8dd978d3526f9ecddfa4f6b.zip |
Automated merge with http://84.46.7.57:1234
Diffstat (limited to 'doc/roster_format.txt')
0 files changed, 0 insertions, 0 deletions