Merge branch 'fix-585882'
authorGustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Tue, 14 Jul 2009 09:30:05 +0000 (10:30 +0100)
committerGustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Tue, 14 Jul 2009 09:30:05 +0000 (10:30 +0100)
commit0e863df2164f231255175745e092c803c56ade2a
treec5f1efd30b02de5769796f30f09108d3e4a278e6
parent69a72d65e8c5341230965098b38dea4c632efca7
parentc157ac3a330abe4831c4c93e52126a054934b9f6
Merge branch 'fix-585882'
libempathy-gtk/empathy-theme-adium.c