Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 21 May 2012 09:18:19 +0000 (11:18 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 21 May 2012 09:18:19 +0000 (11:18 +0200)
commit26b9e04f1c40888bba66bcaace30d9f0feac45fc
treec191578379fbc693b0616b4fd933f8f3322d4dd2
parent19d2ee5fe81b850c8300dca6583e9c49bf6f7afd
parent2b263049bd152504227c9ade7e7b6e17cbc95f11
Merge branch 'gnome-3-4'

Conflicts:
NEWS
configure.ac
src/empathy-accounts.c
NEWS
configure.ac
src/Makefile.am
src/empathy-accounts.c