projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd75afa 4ef07b0)
Merge remote-tracking branch 'origin/gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 19 Dec 2013 08:35:25 +0000 (09:35 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 19 Dec 2013 08:35:25 +0000 (09:35 +0100)
Conflicts:
NEWS
configure.ac
po/es.po
po/ta.po
po/te.po
po/zh_CN.po


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