Merging the removing-ultrasphinx feature branch into the rails3
authorMarius Mathiesen <marius@gitorious.org>
Mon, 29 Oct 2012 10:31:09 +0000 (11:31 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Mon, 29 Oct 2012 10:31:09 +0000 (11:31 +0100)
commit2832a144a972d4d7bb1170489d90002b4158bfb2
treee1439abae56bf913ff15b64282d71e43f08cad89
parent676a8589f547219269d90c10f89ca43f95637794
parentb292f36f6d507833ed4cc262a27f6e4a5a4b979e
Merging the removing-ultrasphinx feature branch into the rails3
feature branch.

Conflicts:
Gemfile
Gemfile.lock
Rakefile
lib/gitorious/search.rb
test/unit/lib/gitorious/search_test.rb
Gemfile
Gemfile.lock
Rakefile
app/models/comment.rb
app/models/merge_request.rb
app/models/repository.rb
test/functional/searches_controller_test.rb