Conflicts:
	examples/dijkstra/why3session.xml
	examples/dijkstra/why3shapes.gz
	src/ide/gmain.ml
	src/session/session.ml
	src/session/session.mli
	src/session/session_scheduler.ml
	src/tools/why3replay.ml
	src/why3session/why3session_copy.ml
	src/why3session/why3session_csv.ml
	src/why3session/why3session_info.ml
	src/why3session/why3session_lib.ml