Merge branch 'change-audio'
authorJonny Lamb <jonnylamb@gnome.org>
Mon, 1 Aug 2011 12:48:32 +0000 (13:48 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Mon, 1 Aug 2011 12:48:32 +0000 (13:48 +0100)
commit7876debb7bc9b6232817e68f00eb2d7484fd034a
treebd4ca2a3e5416d8668dc04acba1ce85d13f2b340
parent4651fb354e601f34dc9df08f2b506f765e455ead
parente17e6184ca30b2164e7b30d1a35f504b87973400
Merge branch 'change-audio'

Conflicts:
src/empathy-call-window.c
src/empathy-call-window.ui

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
src/empathy-call-window.c
src/empathy-call-window.ui