]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4a8508f 1332eb9)
Merge branch 'trivia'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 15 Nov 2010 13:44:35 +0000 (14:44 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 15 Nov 2010 13:44:35 +0000 (14:44 +0100)

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