develop commit
hoge
commit 3.1/develop
Merge branch 'master' into 3.1/develop

Conflicts:
	README.md
Merge pull request #6 from sumimasahiko/3.1/develop

commit 3.1/develop
Merge pull request #7 from sumimasahiko/develop

develop commit
Merge pull request #8 from sumimasahiko/test

hoge
nextブランチから作成したトピックブランチ上での変更
Merge branch 'master' into push-to-next

Conflicts:
	README.md
Merge branch 'push-to-next'