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