]> git.0d.be Git - empathy.git/commit
Merge branch 'fix-586098'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 3 Nov 2009 12:55:26 +0000 (23:55 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 3 Nov 2009 12:55:26 +0000 (23:55 +1100)
commitf72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd
tree97c141ea0f439c548360792ccdf03b2af8cffbd4
parent8b15780d062dfb9263a173ff486fd767f6d47d2c
parentede64d4975a1fca4a562e4635dc43856610788ed
Merge branch 'fix-586098'

Conflicts:
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-chat.c