modified:   .gitignore
	modified:   coeus-code/.gitignore
	modified:   coeus-db/coeus-db-sql/.gitignore
	modified:   coeus-db/coeus-db-xml/.gitignore
	modified:   coeus-form/.gitignore
	modified:   coeus-help/.gitignore
	modified:   coeus-it/.gitignore
	modified:   coeus-tool/.gitignore
	modified:   coeus-webapp/.gitignore
	new file:   coeus-db/.gitignore
	modified:   .gitignore
	modified:   coeus-code/.gitignore
	modified:   coeus-db/coeus-db-sql/.gitignore
	modified:   coeus-db/coeus-db-xml/.gitignore
	modified:   coeus-form/.gitignore
	modified:   coeus-help/.gitignore
	modified:   coeus-it/.gitignore
	modified:   coeus-tool/.gitignore
	modified:   coeus-webapp/.gitignore
	new file:   coeus-db/.gitignore
Merge branch 'master' of https://github.com/yyuan1/kc
	modified:   .gitignore
	modified:   coeus-code/.gitignore
	modified:   coeus-db/coeus-db-sql/.gitignore
	modified:   coeus-db/coeus-db-xml/.gitignore
	modified:   coeus-form/.gitignore
	modified:   coeus-help/.gitignore
	modified:   coeus-it/.gitignore
	modified:   coeus-tool/.gitignore
	modified:   coeus-webapp/.gitignore
	new file:   coeus-db/.gitignore
Merge branch 'master' of https://github.com/yyuan1/kc
	modified:   .gitignore
	modified:   coeus-code/.gitignore
	modified:   coeus-db/coeus-db-sql/.gitignore
	modified:   coeus-db/coeus-db-xml/.gitignore
	modified:   coeus-form/.gitignore
	modified:   coeus-help/.gitignore
	modified:   coeus-it/.gitignore
	modified:   coeus-tool/.gitignore
	modified:   coeus-webapp/.gitignore
	new file:   coeus-db/.gitignore
Merge branch 'master' of https://github.com/yyuan1/kc
Merge branch 'master' of https://github.com/yyuan1/kc
coeus-webapp/.gitignore
Merge branch 'master' of https://github.com/yyuan1/kc into test_branch
commit java files rebased from upstream
commit tag files rebased from upstream
commit xml files rebased from upstream