Tom Preston-Werner 4533e60489 Merge branch 'master' of https://github.com/daneharrigan/jekyll into daneharrigan-master ... Conflicts: lib/jekyll.rb		2012-04-23 16:48:18 -07:00
..
jekyll	Merge branch 'master' of https://github.com/daneharrigan/jekyll into daneharrigan-master	2012-04-23 16:48:18 -07:00