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)
commitb5be743912a828d44439693a7c5da2d8fafba7ca
tree41bc3073be301951090e49311b9d9a75ce747d49
parente08ec076dbf22f4f4bcdaf4ec11ccb4debc2c713
parentc3716f8a8add2a6fbebef81b05281d777c8369ba
Merge branch 'gnome-3-6'

Conflicts:
NEWS
configure.ac