Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 11 Apr 2012 09:09:08 +0000 (11:09 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 11 Apr 2012 09:09:52 +0000 (11:09 +0200)
commitbb1cf54832b5c3b29744407de9189cd63af9c3c2
treec6a9439cdabd11b577223f9f6ff5923e035a4a8c
parentb8e7e162b685196577a7fc7fd4b56c173e76c40e
parent25a167b368cfa169810f4fc6c8d4b9c6adba8aef
Merge branch 'gnome-3-4'

Conflicts:
po/ca@valencia.po
configure.ac
src/empathy-roster-window.c
src/empathy.c