]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'sms-support-rebase'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 5 May 2011 07:37:40 +0000 (17:37 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 5 May 2011 07:37:40 +0000 (17:37 +1000)
1  2 
src/empathy-chat-manager.c
src/empathy-chat-window.c

Simple merge
Simple merge