Conflicts:
	CMakeLists.txt
	auth_plugin/CMakeLists.txt
	auth_plugin/EosAuthOfs.cc
	auth_plugin/ProtoUtils.cc
	common/SymKeys.cc
	doc/releases.rst
	eos.spec.in
	fuse/eosfuse.cc
	fuse/filesystem.cc
	fuse/filesystem.hh
	mgm/CMakeLists.txt
	mgm/XrdMgmOfs.cc
	mgm/XrdMgmOfs.hh
	mgm/XrdMgmOfs/Auth.cc
	mgm/XrdMgmOfsConfigure.cc
	mgm/XrdMgmOfsFile.cc
	namespace/persistency/ChangeLogFileMDSvc.cc
	vst/CMakeLists.txt