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

[Will Thompson <wjt src gnome org>]

commit 5bba4ddbda12fa41f68889a737a7ceaa17496f34
Merge: adfe48f 0f19e7e
Author: Will Thompson <will thompson collabora co uk>
Date:   Tue Jun 28 09:11:42 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(-)
---