Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 15:26:01 +0000 (16:26 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 31 Oct 2013 15:26:01 +0000 (16:26 +0100)

Trivial merge