Tom Preston-Werner a4f3f5c583 Merge commit '0a1e3cd2508c797d7b8d1038636a6e7111e5cd3d'. Fixes #33. ... Conflicts: features/post_data.feature		2010-01-14 20:00:19 -08:00
..
jekyll	Merge commit '0a1e3cd2508c797d7b8d1038636a6e7111e5cd3d'. Fixes #33.	2010-01-14 20:00:19 -08:00
jekyll.rb	resetting to upstream	2010-01-10 10:11:44 +00:00