diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-10-08 17:27:20 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-10-08 17:27:20 +0100 |
| commit | 584b40a6825647ae2388ba47247689e8994c2129 (patch) | |
| tree | 77a86a2fb4ee9e93acfbbbe81537eefb57a01144 /pull_from_master.sh | |
| parent | 37890122d6cd3b5ad419560b06bad2b69b9a5577 (diff) | |
| parent | 0af37d5e1ed0b11e90e63ff232557dc890504a6f (diff) | |
| download | prosody-584b40a6825647ae2388ba47247689e8994c2129.tar.gz prosody-584b40a6825647ae2388ba47247689e8994c2129.zip | |
Merge roster fixes from waqas
Diffstat (limited to 'pull_from_master.sh')
0 files changed, 0 insertions, 0 deletions