* 'permalink-no-dir' of git://github.com/maul-esel/jekyll: test per-post permalinks do not force the permalink to be a dir if it ends on .html Conflicts: features/step_definitions/jekyll_steps.rb  | 
			||
|---|---|---|
| .. | ||
| jekyll_steps.rb | ||
				
					
						
							* 'permalink-no-dir' of git://github.com/maul-esel/jekyll: test per-post permalinks do not force the permalink to be a dir if it ends on .html Conflicts: features/step_definitions/jekyll_steps.rb  | 
			||
|---|---|---|
| .. | ||
| jekyll_steps.rb | ||