Site updated at 2014-08-31 12:13:26 UTC
setup
make octcpress
Merge branch 'master' of github.com:hyanwang/blogsrc

Conflicts:
	Gemfile
	Gemfile.lock
	_deploy
	public/about-me/index.html
	public/atom.xml
	public/blog/2013/06/12/g-tips/index.html
	public/blog/2013/06/12/jso/index.html
	public/blog/2013/06/12/php-data-object/index.html
	public/blog/2013/06/13/mamp1-dot-9-5-mysql5-dot-59-and-ruby-mysql2/index.html
	public/blog/2013/06/13/rhce-test-2012/index.html
	public/blog/2013/06/14/vim-split/index.html
	public/blog/2013/06/17/rails-little-note-1/index.html
	public/blog/2013/06/18/tdd-spec-helper/index.html
	public/blog/2013/07/02/destroy/index.html
	public/blog/2013/07/15/model-for-rails-1/index.html
	public/blog/2013/07/15/model-for-rails-2/index.html
	public/blog/2013/08/11/rails-post/index.html
	public/blog/2013/09/18/const/index.html
	public/blog/2013/11/09/redis/index.html
	public/blog/2013/11/29/about-pagination-on-rails/index.html
	public/blog/2014/03/20/pow-for-mac/index.html
	public/blog/archives/index.html
	public/blog/categories/constant/atom.xml
	public/blog/categories/constant/index.html
	public/blog/categories/controller/atom.xml
	public/blog/categories/controller/index.html
	public/blog/categories/git/atom.xml
	public/blog/categories/git/index.html
	public/blog/categories/javascript/atom.xml
	public/blog/categories/javascript/index.html
	public/blog/categories/jquery/atom.xml
	public/blog/categories/jquery/index.html
	public/blog/categories/json/atom.xml
	public/blog/categories/json/index.html
	public/blog/categories/linux/atom.xml
	public/blog/categories/linux/index.html
	public/blog/categories/mac/atom.xml
	public/blog/categories/mac/index.html
	public/blog/categories/mamp/atom.xml
	public/blog/categories/mamp/index.html
	public/blog/categories/migration/atom.xml
	public/blog/categories/migration/index.html
	public/blog/categories/model/atom.xml
	public/blog/categories/model/index.html
	public/blog/categories/mvc/atom.xml
	public/blog/categories/mvc/index.html
	public/blog/categories/mysql/atom.xml
	public/blog/categories/mysql/index.html
	public/blog/categories/pagination/atom.xml
	public/blog/categories/pagination/index.html
	public/blog/categories/php/atom.xml
	public/blog/categories/php/index.html
	public/blog/categories/post/atom.xml
	public/blog/categories/post/index.html
	public/blog/categories/pow/atom.xml
	public/blog/categories/pow/index.html
	public/blog/categories/rails/atom.xml
	public/blog/categories/rails/index.html
	public/blog/categories/redhat/atom.xml
	public/blog/categories/redhat/index.html
	public/blog/categories/redis/atom.xml
	public/blog/categories/redis/index.html
	public/blog/categories/rhce/atom.xml
	public/blog/categories/rhce/index.html
	public/blog/categories/rspc/atom.xml
	public/blog/categories/rspc/index.html
	public/blog/categories/ruby/atom.xml
	public/blog/categories/ruby/index.html
	public/blog/categories/rvm/atom.xml
	public/blog/categories/rvm/index.html
	public/blog/categories/tdd/atom.xml
	public/blog/categories/tdd/index.html
	public/blog/categories/test/atom.xml
	public/blog/categories/test/index.html
	public/blog/categories/vim/atom.xml
	public/blog/categories/vim/index.html
	public/blog/page/2/index.html
	public/index.html
	public/sitemap.xml
	public/stylesheets/screen.css
	source/_includes/head.html
	source/_posts/2014-08-30-make-octopress.markdown
	source/stylesheets/screen.css