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