diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-04-15 22:45:06 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-04-15 22:45:06 +0100 |
commit | abb4a4f6caa7ae5039c3ba1239f963e090f307c7 (patch) | |
tree | 3e38f864eecc748e87f2fbead4a6461f39337961 /doc/roster_format.txt | |
parent | 4ff48cecfd6ae3a630f92bd0b2bcc6a89c8408c8 (diff) | |
parent | 66a908d35fcb8564d592e8e91133ef337e832284 (diff) | |
download | prosody-abb4a4f6caa7ae5039c3ba1239f963e090f307c7.tar.gz prosody-abb4a4f6caa7ae5039c3ba1239f963e090f307c7.zip |
Merge Zash->trunk
Diffstat (limited to 'doc/roster_format.txt')
0 files changed, 0 insertions, 0 deletions