Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 9 May 2012 12:02:13 +0000 (14:02 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 9 May 2012 12:02:13 +0000 (14:02 +0200)
commit3e8ad073e4434f8dea27c29def12f1548d5d7b86
treebbd930ec5af7a29c9fe2ce694af5003bfd0a2734
parent085365f20953fae1fb95d0272677273e3840e98f
parentaa2c67bebc8dee3d6f53abf8267090d1b68cd098
Merge branch 'gnome-3-4'

Conflicts:
configure.ac
libempathy/empathy-tp-chat.c
src/empathy-event-manager.c
src/empathy-streamed-media-window.c
src/empathy-video-widget.c
configure.ac