diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-06-22 11:55:11 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-06-22 11:55:11 +0100 |
| commit | 8130893db021c332e71f22cf7f271fdcb6a01d54 (patch) | |
| tree | 7745036406bc770e0522991148954b72a7e1b3e7 | |
| parent | 85de327832aa0584a40fe4651aa30fcc204651d8 (diff) | |
| parent | 0ee2bbaca210fa38b396e2ed99ee80a8c2ca9b34 (diff) | |
Merge branch 'telepathy-glib-0.10'
Conflicts:
NEWS
configure.ac
telepathy-glib/base-connection.c
0 files changed, 0 insertions, 0 deletions