re
Merge branch 'master' of git@github.com:knightliao/disconf.git

Conflicts:
	disconf-core/pom.xml
re