diff options
author | Kim Alvefur <zash@zash.se> | 2012-12-16 08:37:14 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2012-12-16 08:37:14 +0100 |
commit | de3f37a1891f6ad019af14b3dce26b621ccfd9c1 (patch) | |
tree | c604c2a76b0d571da3c39a2b8505ca1a538f4f3a /doc/roster_format.txt | |
parent | c8ab15002f6c97e991198b72dcc1eb3f814f5536 (diff) | |
parent | cf3f554dbc9cba6b90f60e9334f581d602e0d4df (diff) | |
download | prosody-de3f37a1891f6ad019af14b3dce26b621ccfd9c1.tar.gz prosody-de3f37a1891f6ad019af14b3dce26b621ccfd9c1.zip |
Merge 0.9->trunk
Diffstat (limited to 'doc/roster_format.txt')
0 files changed, 0 insertions, 0 deletions