Merge branch 'master' of versotest.it.jyu.fi:verso/gitorious
authorMarko Peltola <marko.peltola@jyu.fi>
Thu, 15 Apr 2010 13:30:09 +0000 (16:30 +0300)
committerMarko Peltola <marko.peltola@jyu.fi>
Thu, 15 Apr 2010 13:30:09 +0000 (16:30 +0300)
commit0cbdb8cbd12a56430e0aac0acd628ce48e16fafb
tree70345b8c691465209dc3ab15d6d27ea2f3bfb1b4
parent0ee698e862f49ba1b7be9dbc1ec082eeb4dc381e
parent5c9b12b6126931c95a2d8e80af3211d369690696
Merge branch 'master' of versotest.it.jyu.fi:verso/gitorious

Conflicts:
db/schema.rb

Signed-off-by: Marko Peltola <marko.peltola@jyu.fi>
app/controllers/repositories_controller.rb
app/models/project.rb
app/models/repository.rb
app/views/projects/show.html.erb
app/views/repositories/edit.html.erb
app/views/repositories/new.html.erb
config/locales/en.rb
db/schema.rb