Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 12:24:27 +0000 (13:24 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 12:24:27 +0000 (13:24 +0100)
commitf3e31a9f4bde7ce243e92d9d43c4ce8005dd2231
tree7db4aade53e295c6e3a8ec4610468b9333d3f05a
parent81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a
parent381eb5147aad3488f000201487ec744252698977
Merge branch 'gnome-3-10'