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)
commitd33879921acbd5f1d92565d7e58850aec590c293
tree9f301b48b1eee4a0664626d8f71e07675ca5dfce
parentf3e31a9f4bde7ce243e92d9d43c4ce8005dd2231
parentb36536e8da8702006ccff21c6c9a11ccaa98b5b8
Merge branch 'gnome-3-10'