Fabio Niephaus 2812341c37 Merge branch 'master' of https://github.com/jekyll/jekyll into _includes ... Conflicts: bin/jekyll		2015-08-09 16:22:33 +01:00
..
jekyll	Merge branch 'master' of https://github.com/jekyll/jekyll into _includes	2015-08-09 16:22:33 +01:00