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)
commit25a44d2984058a38f54ab6bd68027e524342e34b
treea698ac149fa82e1c93f0d1d25c45bc68d1ff9fc7
parentf17363e49737c2ad6bf304d7ed1dd2ccf8ca2b4c
parent5c615ca9c2ffcff23925c154e36dfeccf416ec30
Merge branch 'master' into call1
configure.ac
libempathy/empathy-client-factory.c