Merge branch 'master' of git://github.com/imathis/octopress master
authorDavid Blacka <david@blacka.com>
Sat, 17 Oct 2015 16:04:21 +0000 (12:04 -0400)
committerDavid Blacka <david@blacka.com>
Sat, 17 Oct 2015 16:04:21 +0000 (12:04 -0400)
commit41c797ad76d12ab97f1ab349227689a0d315b6ab
treeecca155bdff612c5a44919e18301fdf0ce7dcd97
parentf55a623c22b538e44fa154824615f0f9fdba4810
parentd684a65e4286532789a3f8b160df80ee5801a4a1
Merge branch 'master' of git://github.com/imathis/octopress
Rakefile
_config.yml