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)
commit1e71da786fcbc2ff9f4aa026b2b1fa05a752b499
tree59b43d480647b1d9554a1b7f51ec34a356da2751
parentbd75afa700247fae45e2dcb6c1dd59db14f62d9f
parent4ef07b0e1e7c5d67d34856f243063cc039086058
Merge remote-tracking branch 'origin/gnome-3-10'

Conflicts:
NEWS
configure.ac
po/es.po
po/ta.po
po/te.po
po/zh_CN.po