]> git.0d.be Git - empathy.git/commit - src/empathy-chat-manager.c
Merge remote-tracking branch 'glassrose/save-chatrooms.xml-only-when-needed'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 9 May 2011 14:21:38 +0000 (16:21 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 9 May 2011 14:21:38 +0000 (16:21 +0200)
commitab93e6903be924419add3dc703bf5da9bfca63b3
treeff96a11b3a255ce94b1a7a3845e093bece022ad9
parent0b5aebd734f0a4759d2c8c5438830c372638fb70
parent72785d7ab576618ccc2847b8d51d1f4c9ff19241
Merge remote-tracking branch 'glassrose/save-chatrooms.xml-only-when-needed'