projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81c169d 381eb51)
Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 12:24:27 +0000 (13:24 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 12:24:27 +0000 (13:24 +0100)

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