Merge remote-tracking branch 'pochu/upgrade-software'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:42:36 +0000 (15:42 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:42:52 +0000 (15:42 +1100)
1  2 
libempathy/empathy-utils.c
src/empathy-main-window.c

Simple merge
Simple merge