]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 459911d fabe2b1)
Merge remote-tracking branch 'origin/gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 12:21:23 +0000 (13:21 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 12:21:23 +0000 (13:21 +0100)
Conflicts:
po/cs.po
po/es.po
po/nb.po


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