Merge remote-tracking branch 'origin/call1' into master+call
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Feb 2012 07:26:19 +0000 (08:26 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Feb 2012 07:26:19 +0000 (08:26 +0100)
commit894b1f315b62499a5d305aff6b937093a20df1a4
tree8cecdaff46a2ee3360f9e676d11672c388a23082
parent58574c8dc2e5261d8c89b9a6b6fda41687a386ea
parent1af2b9b657046268d0a44fd2aa588ea281ad1f20
Merge remote-tracking branch 'origin/call1' into master+call

Conflicts:
configure.ac
telepathy-yell
configure.ac
libempathy/Makefile.am
src/Makefile.am
src/empathy-call-window.c
src/empathy-call.c