"Automated commit at 2014-01-12 02:27:24 UTC by middleman-deploy 0.1.4"
"Automated commit at 2014-01-12 02:28:08 UTC by middleman-deploy 0.1.4"
"Automated commit at 2014-01-12 02:30:05 UTC by middleman-deploy 0.1.4"
Merge branch 'master' into gh-pages
...
"Automated commit at 2014-01-13 21:08:58 UTC by middleman-deploy 0.1.4"
cleanup
Merge branch 'gh-pages' of https://github.com/aentan/aenism into gh-pages

Conflicts:
	2012/01/01/index.html
	2012/01/01/index.html.gz
	2012/01/index.html
	2012/01/index.html.gz
	2012/index.html
	2012/index.html.gz
	assets/fonts/bootstrap/glyphicons-halflings-regular-23799c0a.eot
	assets/fonts/bootstrap/glyphicons-halflings-regular-536d2b1b.ttf
	assets/fonts/bootstrap/glyphicons-halflings-regular-c6ea7b1a.woff
	assets/fonts/bootstrap/glyphicons-halflings-regular-ecee9033.svg
	feed.xml
	general/example-article/index.html
	general/example-article/index.html.gz
	index.html
	index.html.gz
	tags/example/index.html
	tags/example/index.html.gz
cleanup
Merge branch 'gh-pages'