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)
1  2 
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-theme-adium.c

Simple merge
Simple merge