]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7abf768 8c1e755)
Merge commit 'kaserf/master'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 21 Oct 2009 09:21:41 +0000 (10:21 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 21 Oct 2009 09:21:41 +0000 (10:21 +0100)

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