Merge branch 'gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 26 Jun 2013 08:47:31 +0000 (10:47 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 26 Jun 2013 08:47:31 +0000 (10:47 +0200)
1  2 
libempathy-gtk/empathy-log-window.c

Simple merge