Site updated at 2013-05-29 14:21:58 UTC
Site updated at 2013-05-29 15:40:53 UTC
update
Merge branch 'master' of github.com:lenciel/lenciel.github.com into source

Conflicts:
	404.html
	atom.xml
	blog/archives/index.html
	index.html
	sitemap.xml
Site updated at 2013-05-29 16:06:07 UTC
Merge branch 'master' of github.com:lenciel/lenciel.github.com into source

Conflicts:
	atom.xml
	sitemap.xml
	stylesheets/screen.css
update
Site updated at 2013-06-08 16:03:12 UTC
remove _deploy from repo
images
Merge branch 'master' of github.com:lenciel/lenciel.github.com into source

Conflicts:
	404.html
	atom.xml
	blog/archives/index.html
	index.html
	sitemap.xml
better git log
new post
Merge branch 'source' of github.com:lenciel/lenciel.github.com into source

Conflicts:
	.gitignore
	_config.yml
	_deploy/atom.xml
	_deploy/blog/categories/blog/atom.xml
	_deploy/blog/categories/configuration/atom.xml
	_deploy/blog/categories/github/atom.xml
	_deploy/blog/categories/octopress/atom.xml
	_deploy/blog/categories/osx/atom.xml
	_deploy/blog/categories/rants/atom.xml
	_deploy/blog/categories/rss/atom.xml
	_deploy/blog/categories/server/atom.xml
	_deploy/blog/categories/software-engineering/atom.xml
	_deploy/blog/categories/thougts/atom.xml
	_deploy/blog/categories/tips/atom.xml
	_deploy/blog/categories/tool/atom.xml
	_deploy/blog/categories/tools/atom.xml
	_deploy/blog/categories/tutorial/atom.xml
	_deploy/blog/categories/tutorials/atom.xml