Merge branch: 'Add top-up link to chat text when there is insufficient credit'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:21:17 +0000 (15:21 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:21:35 +0000 (15:21 +1100)
commit1180b055b932a8f1a1a6b207093e81b412e62da2
treeee561960f46252199ff32a468f506ace6dd3b689
parent8b6c644661a69599a86a5957bcb559383fb857c1
parent601297c0ea82f38432445a2dc4a211cbdb98e915
Merge branch: 'Add top-up link to chat text when there is insufficient credit'
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-theme-adium.c