Merge branch 'next' into feature/rails3
authorChristian Johansen <christian@gitorious.com>
Fri, 4 Jan 2013 08:32:35 +0000 (09:32 +0100)
committerChristian Johansen <christian@gitorious.com>
Fri, 4 Jan 2013 08:32:35 +0000 (09:32 +0100)
commit9edbb51e86270cfdc1024a3547b2fbdd5e4d8874
tree54a45b38e3880c2ad7afaff931ff1baca12ecc73
parent446838b37f010b5daecfd8f409300cf285787c8e
parent150012d8e5efbdb73c4b2cb9f344a989b81d2e8e
Merge branch 'next' into feature/rails3

Conflicts:
Gemfile
Gemfile.lock
app/helpers/application_helper.rb
app/models/repository.rb
app/views/users/edit.html.erb
config/gitorious.sample.yml
lib/gitorious.rb
app/helpers/application_helper.rb
app/helpers/searches_helper.rb
app/models/repository.rb
app/views/users/edit.html.erb
test/unit/repository_test.rb