Conflicts:
	.gear/rules
	TODO
	conf/libuniset2.spec
	extensions/ModbusMaster/MBExchange.cc
	extensions/lib/MTR.cc