Parker Moore 955dc38400 Deep merge data overrides into defaults.		2014-04-05 15:42:53 -04:00
..
jekyll	Deep merge data overrides into defaults.	2014-04-05 15:42:53 -04:00
site_template	Merge pull request #2200 from fabianrbz/remove_unnecessary_post	2014-04-01 23:10:37 -04:00
jekyll.rb	Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults	2014-04-04 15:32:27 -04:00