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

Simple merge