Merge branch 'gnome-3-6'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 24 Jan 2013 14:14:25 +0000 (15:14 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 24 Jan 2013 14:14:25 +0000 (15:14 +0100)
commit02a03438ffb23d728a07bdc7cfacdb6abddbc35a
tree1c3357f99db97136a893fff551222dc37683665a
parente02bd4d24d0dbbc138e9e8f6cba07fdf332caaed
parent8fd28512046a9505e31705c9440623a63d719ab4
Merge branch 'gnome-3-6'