Site updated at 2013-11-07 19:32:40 UTC
Merge branch 'master' of https://github.com/pmacn/pmacn.github.io

Conflicts:
	archives/index.html
	atom.xml
	blog/2013/11/06/octopress-on-windows/index.html
	blog/2013/11/06/oh-view-where-art-thou/index.html
	blog/2013/11/06/the-a-hole-lane/index.html
	blog/archives/index.html
	blog/categories/nancyfx/atom.xml
	blog/categories/nancyfx/index.html
	blog/categories/octopress/atom.xml
	blog/categories/octopress/index.html
	blog/categories/xunit/atom.xml
	blog/categories/xunit/index.html
	index.html
	sitemap.xml
Site updated at 2013-11-07 19:35:37 UTC