Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 7 Jan 2014 09:38:32 +0000 (10:38 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 7 Jan 2014 09:38:32 +0000 (10:38 +0100)
commitdf6bd22f9a320dad25eaffa5c061921de7ee351b
treef61da94f8e46787532dec185e31ea2310c2ba65d
parent57396500ea506ca42677292b6ab8e0cf664e5f7f
parent4a0d05f76bb33b1a78c96333780d38b23cc74b16
Merge branch 'gnome-3-10'

Conflicts:
NEWS
configure.ac
help/el/el.po