Merge branch 'gnome-3-8'
authorXavier Claessens <xavier.claessens@collabora.co.uk>
Wed, 3 Apr 2013 08:09:56 +0000 (10:09 +0200)
committerXavier Claessens <xavier.claessens@collabora.co.uk>
Wed, 3 Apr 2013 08:09:56 +0000 (10:09 +0200)
commitf5d311ec7a8e609dbd94914e15d2bd983f05224c
tree022dc017c88b590e66f7d3bd6eecab68b6f7851c
parent0ad138fa1c21e7f58b617fe34506ee3dc3bdc695
parent3af2b86ec550ae1f37f25504afb95c590e7dd085
Merge branch 'gnome-3-8'
ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c