TODO 83ec705a905f02154bcba1e79375156fcaa5b093 2c5e8194b8bc6d8366c0f754bfc93aa7c54f9ca9 Mat Brown mat@patch.com http://github.com/outoftime/sunspot_rails/commit/f45cc8249d1faa2c99b425271b5bb2e8b201c28e f45cc8249d1faa2c99b425271b5bb2e8b201c28e 2009-09-21T12:50:39-07:00 2009-09-21T12:50:39-07:00 Merge branch 'master' into downstream Conflicts: TODO 07d08c8cdbd3c908121589c8032321ce0c805b97 Mat Brown mat@patch.com