]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'sms-651242'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 8 Jun 2011 09:43:59 +0000 (11:43 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 8 Jun 2011 09:43:59 +0000 (11:43 +0200)
1  2 
libempathy-gtk/empathy-chat.c

Simple merge