]> git.0d.be Git - empathy.git/commit - libempathy/empathy-ft-handler.c
Merge branch 'gnome-3-8'
authorXavier Claessens <xavier.claessens@collabora.co.uk>
Wed, 26 Jun 2013 13:29:13 +0000 (15:29 +0200)
committerXavier Claessens <xavier.claessens@collabora.co.uk>
Wed, 26 Jun 2013 13:29:13 +0000 (15:29 +0200)
commit8e692d867aa5a7679b8123a6c3f32d06c6bb0d56
tree164739d9832c3c187c3aeab410c0e3fb86418fab
parentdc44f6dd6245befd9e9e44ac77bb879725f7c3fc
parent76a11c06dae40c16d70c506b808bec51d5a1cd13
Merge branch 'gnome-3-8'
src/empathy-accounts-dialog.c