Merge branch 'next' into feature/rails3
authorChristian Johansen <christian@gitorious.com>
Tue, 4 Dec 2012 10:26:01 +0000 (11:26 +0100)
committerChristian Johansen <christian@gitorious.com>
Tue, 4 Dec 2012 10:26:01 +0000 (11:26 +0100)
commit9c36317887d269697c987497008fe6eecf1e0eb4
tree7aa732c8d4db0ab04d406a13a9cf85dad49b2e8e
parentdbf098f0c5bd3ce356b2f014c71ef27a858942e8
parent6cb6e028460fe10d8c9e1ac6f4d1bba2e7c73248
Merge branch 'next' into feature/rails3

Conflicts:
app/helpers/searches_helper.rb
data/hooks/messaging.rb
db/schema.rb
lib/gitorious.rb
test/functional/admin/repositories_controller_test.rb
test/functional/searches_controller_test.rb
app/controllers/admin/repositories_controller.rb
app/helpers/projects_helper.rb
app/helpers/searches_helper.rb
app/views/searches/show.html.erb
data/hooks/messaging.rb
db/schema.rb
test/functional/admin/repositories_controller_test.rb
test/functional/projects_controller_test.rb
test/functional/searches_controller_test.rb