[empathy: 3/7] Merge branch 'bigger-favourite-chatrooms'

[Will Thompson <wjt src gnome org>]

commit 9d13e5abfc9802832cc0e81cfa96663ffdd4744d
Merge: d191659 0f19e7e
Author: Will Thompson <will thompson collabora co uk>
Date:   Mon Jun 27 14:02:48 2011 +0100

    Merge branch 'bigger-favourite-chatrooms'

 src/empathy-chatrooms-window.c  |   10 +++++
 src/empathy-chatrooms-window.ui |   71 ++++++++++++++++++++++++--------------
 2 files changed, 55 insertions(+), 26 deletions(-)
---