gphat/data-searchengine-elasticsearch — pull request #2 by holophrastic (2012-02-17 03:53:25+00:00)
Title: Conflicts resolved

Our repos diverged. I cleaned up the conflicts, and here's the result.