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)
commit22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6
treef3fbcd00c9042a738e1440f3ca6d0081c2cf281e
parent356ab07267fb30aae5a71cd4c17d10044d86ecf4
parent8272468f01ba232565a518bdd7c8893eca751495
Merge branch 'gnome-3-6'

Conflicts:
configure.ac
po/da.po
po/et.po
po/kn.po
po/mr.po
po/nb.po
po/sk.po