diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-06-04 11:59:27 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-06-04 11:59:27 +0100 |
commit | 1cbe74e4286b97d4ac5758e65b0cbd253a121f80 (patch) | |
tree | 563178d7b6832ff1640b769e2c5d6fc707fc763e /man | |
parent | 1486d4fdae138f0e45df3e8b6c3213978b27b46d (diff) | |
parent | 617f5ca017c7f992c7a0269a45a6b890cf543863 (diff) | |
download | prosody-1cbe74e4286b97d4ac5758e65b0cbd253a121f80.tar.gz prosody-1cbe74e4286b97d4ac5758e65b0cbd253a121f80.zip |
Merge backout
Diffstat (limited to 'man')
0 files changed, 0 insertions, 0 deletions