modified:   client/client.c
	modified:   common/ppfile.c
	modified:   mds/mdmd.c
	modified:   mds/mdmd.h
	modified:   mis/mis.c
Merge branch 'master' of https://github.com/womendezuguo/mis

Conflicts:
	mds/mdmd.c