Tom Preston-Werner 89180169a4 Merge branch 'include' of https://github.com/lukebayes/jekyll into lukebayes-include ... Conflicts: lib/jekyll.rb lib/jekyll/site.rb		2012-01-14 19:48:04 -08:00
..
jekyll	Merge branch 'include' of https://github.com/lukebayes/jekyll into lukebayes-include	2012-01-14 19:48:04 -08:00
jekyll.rb	Merge branch 'include' of https://github.com/lukebayes/jekyll into lukebayes-include	2012-01-14 19:48:04 -08:00