Merge branch 'gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 3 May 2013 12:19:23 +0000 (14:19 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 3 May 2013 12:19:23 +0000 (14:19 +0200)
commitc4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed
tree4064eef2e8386c40d8c8eccacb33705f23e7fab7
parenteb3b3c918fdb99db70d539257e8a1723f280e821
parent63ded644beff3bb2501c3df640ca3af795b29e16
Merge branch 'gnome-3-8'

Conflicts:
src/empathy.c
libempathy/empathy-utils.c