Merge branch 'gnome-3-6'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 16 Jan 2013 08:03:28 +0000 (09:03 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 16 Jan 2013 08:03:28 +0000 (09:03 +0100)
Conflicts:
NEWS
configure.ac


Trivial merge