Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 5 Jun 2012 07:31:04 +0000 (09:31 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 5 Jun 2012 07:31:04 +0000 (09:31 +0200)
commit213c011e801827daefab7bef64e0e70ba7f1d78e
tree1b09b1fac0a2c845777ca9792789ee27cc6bc7ee
parentc217f84732cad84541389dc2d317992cf0199d18
parent047c6ffac32caebc3d4929ecd2fec8a55da6796a
Merge branch 'gnome-3-4'
src/empathy-auth-client.c