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)
1  2 
libempathy-gtk/empathy-user-info.c

Simple merge