diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-06 16:28:31 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-06 16:28:31 +0100 |
| commit | bae4f7493376cccb2cd629e56b4e4cc0624720b6 (patch) | |
| tree | 20de1c96d6daec90bee6c3cd2887b3d7bf1e0fc7 | |
| parent | 991c397c6cd33fa970afe8fa46143ae9201b2002 (diff) | |
| parent | 5a349b2323f8bfd8a5d18c1bc2d79ef14689c0fe (diff) | |
Merge branch 'telepathy-gabble-0.16'
Conflicts:
NEWS
configure.ac
0 files changed, 0 insertions, 0 deletions