Conflicts:
	Makefile.am
	lib/cli.py
	lib/client/gnt_instance.py
	lib/cmdlib.py
	lib/constants.py
	lib/opcodes.py

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>