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)
1  2 
src/empathy-accounts-dialog.c

Simple merge