文章编辑、发布
Merge branch 'master' into gh-pages

Conflicts:
	archives.html
	categories.html
	category/misc.html
	category/misc2.html
	feeds/all.atom.xml
	feeds/misc.atom.xml
	index.html
	index2.html
	pages/about.html
	posts/2013-09-08/debian-add-cnnic-ca.html
	posts/2013-09-08/django-multiple-select-option-with-title.html
	posts/2013-09-08/install-facebook-scribe-on-debian-squeeze.html
	posts/2013-09-08/windows-openvpn-remember-password.html
	tag/bind.html
	tag/debian.html
	tag/django.html
	tag/jinja.html
	tag/openvpn.html
	tag/pelican.html
	tag/python.html
	tag/scribe.html
	tag/windows.html
	tags.html
	theme/css/style.css
文章编辑、发布
文章编辑、发布