Merge branch 'gnome-3-8'
authorXavier Claessens <xavier.claessens@collabora.co.uk>
Tue, 7 May 2013 13:24:13 +0000 (15:24 +0200)
committerXavier Claessens <xavier.claessens@collabora.co.uk>
Tue, 7 May 2013 13:24:13 +0000 (15:24 +0200)
commit10983e93f69ddcc048cc582d777433ca2c7a2b39
tree1b84157572eb93f90af25e2c88442d72f0def40e
parent87d26a13dcafdbd1a2f19817a987ad43b2a5336d
parentadd79d54e3c0149a2c336077d1e37c60d54c5ace
Merge branch 'gnome-3-8'
libempathy-gtk/empathy-user-info.c