Merge branch 'fix-585601'
authorGustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Thu, 2 Jul 2009 14:15:13 +0000 (11:15 -0300)
committerGustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Thu, 2 Jul 2009 14:15:13 +0000 (11:15 -0300)
commit5dae9d1185b972651a7c7e8d4431f8dcdd2e0cd3
tree8cd15d24cebb2030abddbd8f0d43b10f9a3ce050
parent5af5dedd2bd5a57f700d3abf7a326d0462494caa
parentf923e5ed0d36621b580061dbaff834ec7e7ee0bc
Merge branch 'fix-585601'
libempathy-gtk/empathy-chat-text-view.c
libempathy-gtk/empathy-theme-adium.c