diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-25 16:31:52 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-25 16:31:52 +0000 |
commit | f796e7a6cbb2623a9e613b03c98e5540fac4bf4b (patch) | |
tree | 9148921ad29ea7185a9a49a26d01919ab40807c5 | |
parent | 0d17ae2b61e147ca0100f2440129c553d8c06e9c (diff) | |
parent | b47939d5423ca851bca4a2a41d5a1f481a0bfb27 (diff) |
Merge branch 'telepathy-glib-0.12'
Conflicts:
NEWS
configure.ac
-rw-r--r-- | NEWS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,6 +1,8 @@ telepathy-glib 0.13.7 (UNRELEASED) ================================== +This release includes all bugfixes from 0.12.5. + Enhancements: • Update to spec 0.21.5 (smcv) |