]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'more-contact-info'
authorWill Thompson <will.thompson@collabora.co.uk>
Mon, 16 May 2011 13:08:10 +0000 (14:08 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Mon, 16 May 2011 13:08:10 +0000 (14:08 +0100)
1  2 
libempathy-gtk/empathy-chat.c

Simple merge