diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-02 16:44:31 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-02 16:44:31 +0100 |
commit | 7b6e496317a332b81fb079256f7995cf082b5c57 (patch) | |
tree | 9f2b76ea8cc63c6c6ae63cb951a5f4c2b68bd9bf /tests | |
parent | e7b9ae33a0075541aa2f2376c2254ea0282920d7 (diff) | |
parent | 96cfbd0e8401ab06b729cfa5b092d5939899dc6b (diff) | |
download | telepathy-glib-7b6e496317a332b81fb079256f7995cf082b5c57.tar.gz |
Merge branch 'telepathy-glib-0.22'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions