]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 518b442 afb871a)
Merge branch 'preset-581029'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 8 Nov 2010 12:39:22 +0000 (13:39 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 8 Nov 2010 12:39:22 +0000 (13:39 +0100)

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