Merge branch 'master' into call1
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 17 Jan 2012 09:10:43 +0000 (20:10 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 17 Jan 2012 09:10:43 +0000 (20:10 +1100)
1  2 
configure.ac
libempathy/empathy-client-factory.c

diff --cc configure.ac
Simple merge
Simple merge