Tom Preston-Werner cae0eaf19c Merge remote-tracking branch 'mjschultz/master' ... Conflicts: lib/jekyll/filters.rb		2011-05-30 12:27:11 -07:00
..
jekyll	Merge remote-tracking branch 'mjschultz/master'	2011-05-30 12:27:11 -07:00
jekyll.rb	Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions'	2011-05-30 11:38:59 -07:00