dd
Merge branch 'gh-pages' of https://github.com/wenyou/wenyou into gh-pages

Conflicts:
	_posts/2009-02-12-分析ecshop里的globals.md