diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-03 22:05:05 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-03 22:05:05 +0000 |
| commit | 2650d367fa08e67a0a1f6cfbaaebf5fd3221ecd6 (patch) | |
| tree | 697417ad96b0e631039bcc5e338822a94b61638b /doc/roster_format.txt | |
| parent | 30e384b6f629033b49c3d304f31079b508a9ef27 (diff) | |
| parent | 8862e1b27eb767c99a068d13bd15c77c2c9e1471 (diff) | |
| download | prosody-2650d367fa08e67a0a1f6cfbaaebf5fd3221ecd6.tar.gz prosody-2650d367fa08e67a0a1f6cfbaaebf5fd3221ecd6.zip | |
Merge 0.6.2/waqas with 0.6.2/MattJ
Diffstat (limited to 'doc/roster_format.txt')
0 files changed, 0 insertions, 0 deletions