diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 19:06:37 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 19:06:37 +0100 |
commit | f4ad3d7c7bb697d0e4cd73fd88583c375dea643c (patch) | |
tree | f3ecf6ae2a1b23de52a01f0bc9cab778fac0b96c /telepathy-glib/Makefile.am | |
parent | b22e19becc7a2640c7fa025dc2c7a3e6dd01227e (diff) | |
parent | 300598d142a66c168d6a609db9f9dff487620dec (diff) |
Merge branch 'master' into next
Diffstat (limited to 'telepathy-glib/Makefile.am')
0 files changed, 0 insertions, 0 deletions