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)
commit31ec75a03a132770268cf02d98f2b477747bb54f
treeb05a4f30c3ff3bda1bc4f9ee9c6170136a0f4189
parent16973fd1a14657eebf1cb39dd3f912db59a2fa77
parent1e7449f5a14e2f031389808206c9991f65d3ade7
Merge branch 'gnome-3-6'

Conflicts:
po/kn.po
po/ta.po