diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-04-08 20:19:55 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-04-08 20:19:55 +0100 |
commit | f6a5da2375a21b7cd2429b7ba82d819683af5109 (patch) | |
tree | 7148b7e142e79cfc47dcec5f7e22f47a219946b3 /doc/roster_format.txt | |
parent | 9982558804de3976a3d5d9e12ab5215503420e0f (diff) | |
parent | edd59b5d381bd8b0daee063a99f8678f86f6b9bb (diff) | |
download | prosody-f6a5da2375a21b7cd2429b7ba82d819683af5109.tar.gz prosody-f6a5da2375a21b7cd2429b7ba82d819683af5109.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'doc/roster_format.txt')
0 files changed, 0 insertions, 0 deletions