]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b5aebd 72785d7)
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)

Trivial merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)