projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5739650 4a0d05f)
Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 7 Jan 2014 09:38:32 +0000 (10:38 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 7 Jan 2014 09:38:32 +0000 (10:38 +0100)
Conflicts:
NEWS
configure.ac
help/el/el.po


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