octopress/docs — pull request #6 by parkr (2013-09-25 19:30:28+00:00)
Title: Bring in site 2.1 branch

This is all that was different b/w the two branches (excluding the stuff in the root of the dir).