]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e6d192 34a97e5)
Merge remote branch 'vminko/fix-573283'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 25 Oct 2010 12:33:47 +0000 (14:33 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 25 Oct 2010 12:33:47 +0000 (14:33 +0200)

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