Octopress init
Site updated at 2013-01-02 07:58:32 UTC
Site updated at 2013-01-02 08:15:33 UTC
Site updated at 2013-01-02 08:18:17 UTC
Site updated at 2013-01-03 21:24:12 UTC
Site updated at 2013-01-03 21:36:15 UTC
Site updated at 2013-01-03 21:57:19 UTC
Site updated at 2013-01-03 21:58:14 UTC
Merge branch 'master' of github.com:dualface/dualface.github.com into source

Conflicts:
	atom.xml
	blog/2012/08/05/first-octopress-post/index.html
	blog/2012/08/17/cocos2d-x-2-dot-0-multi-resolution/index.html
	blog/2012/08/25/tolua-plus-plus-implement/index.html
	blog/archives/index.html
	blog/categories/blog/atom.xml
	blog/categories/blog/index.html
	blog/categories/cocos2dx/atom.xml
	blog/categories/cocos2dx/index.html
	blog/categories/lua/atom.xml
	blog/categories/lua/index.html
	images/line-tile.png
	index.html
	javascripts/github.js
	javascripts/pinboard.js
	javascripts/twitter.js
	sitemap.xml
	stylesheets/screen.css
move