Merge remote branch 'glassrose/accounts-supporting-chatrooms-only-603027'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 10 Jan 2011 10:02:02 +0000 (11:02 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 10 Jan 2011 10:02:02 +0000 (11:02 +0100)
commit363c9bdf35a11cde6ba7a0da3bc2cb7fcdb7a1b6
tree0db8c671e8825d5343053b37c2a3b3e196c8b176
parentd5f5cfab4704fad9fad29a1e69a230645f0a4aa5
parent98b73f3620f3b2f94e7d2ce3cfd2cd07cc637d13
Merge remote branch 'glassrose/accounts-supporting-chatrooms-only-603027'