Merge branch 'bigger-favourite-chatrooms'
commit5bba4ddbda12fa41f68889a737a7ceaa17496f34
authorWill Thompson <will.thompson@collabora.co.uk>
Tue, 28 Jun 2011 08:11:42 +0000 (28 09:11 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Tue, 28 Jun 2011 08:11:42 +0000 (28 09:11 +0100)
treefd01653d2966783bbf444d6d80ed10f67dd7a6cf
parentadfe48fe482e2aa966e7793652d3234685d07362
parent0f19e7e7b63a2c457a498bf84d4928db59fb56e4
Merge branch 'bigger-favourite-chatrooms'