resolve/refinerycms-search — pull request #21 by parndt (2012-04-16 23:37:41+00:00)
Title: Merge 2 0 stable

This replaces #20 as I've done the "hard work" of merge conflicts.