Merge branch 'gnome-3-6'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 22 Nov 2012 08:37:57 +0000 (09:37 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 22 Nov 2012 08:37:57 +0000 (09:37 +0100)
Conflicts:
configure.ac
po/da.po
po/et.po
po/kn.po
po/mr.po
po/nb.po
po/sk.po


Trivial merge