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)
commitdc44f6dd6245befd9e9e44ac77bb879725f7c3fc
tree280460208520a74f02c358952b15f2aa4245b82c
parente80012b79bb56bbb7d4616f58b5509775e0e355f
parent6bace22f3ffb9695870267e2a59858b3feeaa83e
Merge branch 'gnome-3-8'
libempathy-gtk/empathy-log-window.c