[empathy: 3/3] Merge branch 'channel-accessors'

[Guillaume Desmottes <gdesmott src gnome org>]

commit a74be9c64f64980bf542f07fe970787cfd0599e9
Merge: 1c67913 77d5de2
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Sep 13 17:58:14 2010 +0200

    Merge branch 'channel-accessors'

 configure.ac                 |    2 +-
 libempathy/empathy-tp-call.c |    7 +------
 libempathy/empathy-tp-file.c |    4 +---
 3 files changed, 3 insertions(+), 10 deletions(-)
---