]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4115e48 36f10a0)
Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 30 Apr 2012 15:11:11 +0000 (17:11 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 30 Apr 2012 15:11:11 +0000 (17:11 +0200)

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