Merge branch 'gnome-3-8'

author Xavier Claessens <xavier.claessens@collabora.co.uk>

Wed, 3 Apr 2013 08:09:56 +0000 (10:09 +0200)

committer Xavier Claessens <xavier.claessens@collabora.co.uk>

Wed, 3 Apr 2013 08:09:56 +0000 (10:09 +0200)
author Xavier Claessens <xavier.claessens@collabora.co.uk>
Wed, 3 Apr 2013 08:09:56 +0000 (10:09 +0200)
committer Xavier Claessens <xavier.claessens@collabora.co.uk>
Wed, 3 Apr 2013 08:09:56 +0000 (10:09 +0200)
diff --cc ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
Simple merge
author	Xavier Claessens <xavier.claessens@collabora.co.uk>
	Wed, 3 Apr 2013 08:09:56 +0000 (10:09 +0200)
committer	Xavier Claessens <xavier.claessens@collabora.co.uk>
	Wed, 3 Apr 2013 08:09:56 +0000 (10:09 +0200)