Conflicts:
	INSTALL
	NEWS
	configure.ac
	src/Ganeti/Query/Group.hs
	test/hs/Test/Ganeti/Objects.hs
	test/hs/Test/Ganeti/Query/Query.hs

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>