Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 27 Dec 2013 16:00:04 +0000 (17:00 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 27 Dec 2013 16:00:04 +0000 (17:00 +0100)
commit41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7
treea0e9506d44e441333586d2cf976200bbe685b6af
parent4de10b5ccf45229e8557b808ae601073d23251c4
parentac8964d55c1c8fa4b349a0b3c995d605b3ed33c9
Merge branch 'gnome-3-10'