diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-09-11 15:49:33 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-09-11 15:49:33 +0200 |
| commit | eb53bcaffc16ae388d3cda3b13e7088d84f80388 (patch) | |
| tree | a382337bbcb466728091f5911a0f28fff0d017a7 /src/conn-contact-info.c | |
| parent | 4c720bc262ea35b802606910b63b57f28929bdc6 (diff) | |
| parent | 2a1788842f38aaadb028ddd96f7e82f6db7e70b8 (diff) | |
Merge branch 'telepathy-gabble-0.16'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/conn-contact-info.c')
0 files changed, 0 insertions, 0 deletions