diff options
| author | Olli Salli <olli.salli@collabora.co.uk> | 2012-03-13 13:42:16 +0200 |
|---|---|---|
| committer | Olli Salli <olli.salli@collabora.co.uk> | 2012-03-13 13:42:20 +0200 |
| commit | 1fdd43a2bce59761dc4d7a6c99dbb0ebcb02b423 (patch) | |
| tree | fcbde49734e4391e78aad25ff13036aa5b6a183a /data | |
| parent | 91739c7079504cf1d15e6c43ffbf48620d25c22c (diff) | |
| parent | 1fa8e3da3c2ba2438757457d1893c8fe72bc9169 (diff) | |
| download | telepathy-salut-1fdd43a2bce59761dc4d7a6c99dbb0ebcb02b423.tar.gz | |
Merge remote-tracking branch 'siraj/bonjour_windows'
Reviewed-by: Olli Salli (oggis) <olli.salli@collabora.co.uk>
Reviewed-by: Jonny Lamb (jonnylamb) <olli.salli@collabora.co.uk>
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions