diff options
| author | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-10-11 21:37:22 +0000 |
|---|---|---|
| committer | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-10-11 21:37:22 +0000 |
| commit | 6f147a0a3aafb6f5d87a01b1961e2372ccb17b46 (patch) | |
| tree | a1c12a3a4f3dc6deff717b4f94aa491214e35e55 | |
| parent | 35ace593f081a69fe151c4cfd6ab19bc321a56ce (diff) | |
| download | telepathy-gabble-6f147a0a3aafb6f5d87a01b1961e2372ccb17b46.tar.gz | |
merge conflicts between vcard and IVC branch
20061011213722-418b8-f2f3dd31ef951081eb83f8d7ce0d76ddd0755221.gz
0 files changed, 0 insertions, 0 deletions