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)
commitf8148be971e1b51e43374473ab33e5ac8fd14a40
tree5a2d7da471589b1d68b312531c3eeac87cdf03f2
parentfecbf935f2b9be2cd6229099334279028fc517f1
parent832ab62ef5fd25ca11f9739f4caa4cac971fd42b
Merge remote-tracking branch 'pochu/upgrade-software'
libempathy/empathy-utils.c
src/empathy-main-window.c