uma
Merge branch 'master' of https://github.com/yoshi1108/yosh
'hoge'
hoge
'hoge'
Merge branch 'master' of https://github.com/yoshi1108/yosh

Conflicts:
	.vimrc
	src/uma/grails-app/services/uma/JraWeb.groovy
	src/uma/uma.ini
	src/uma/uma.sh
'hoge'
hoge