projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16973fd 1e7449f)
Merge branch 'gnome-3-6'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 7 Jan 2013 13:08:27 +0000 (14:08 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 7 Jan 2013 13:08:27 +0000 (14:08 +0100)
Conflicts:
po/kn.po
po/ta.po


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