publish
publish
Merge commit 'cfa43c84d7c3984a447aef998039141042bc9298'

Conflicts:
	htdocs/atom.xml
	htdocs/entry/2014-09-02-01.html
	htdocs/index.html
use git-pushdir. kazuho++