jekyll/jekyll — pull request #2531 by parkr (2014-06-18 22:10:44+00:00)
Title: Merge file system categories with categories from YAML.

Fixes #2527.