Merge branch 'master' of gitorious.org:gitorious/mainline
authorOle Martin Kristiansen <ole@shortcut.no>
Tue, 20 Apr 2010 08:17:31 +0000 (10:17 +0200)
committerOle Martin Kristiansen <ole@shortcut.no>
Tue, 20 Apr 2010 08:17:31 +0000 (10:17 +0200)
commit0bee4d84000c062f4d4d4d53f5cf8abd8840cc21
tree78fef5e5aba54fde65361ed9a284c3617bd052bc
parent40b70af19787a3b5ca1db299fac367678c48ea3b
parent0bb149ac99c9869e88426c1c2dd8089ec55a5a4a
Merge branch 'master' of gitorious.org:gitorious/mainline

Conflicts:
app/helpers/application_helper.rb
app/views/events/_events.html.erb
app/views/layouts/_login_logout.html.erb
app/views/layouts/application.html.erb
app/views/projects/index.html.erb
app/views/projects/show.html.erb
app/views/site/index.html.erb
app/views/users/show.html.erb
public/stylesheets/base.css
vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb
app/helpers/application_helper.rb
app/helpers/favorites_helper.rb
app/views/events/_events.html.erb
app/views/layouts/_login_logout.html.erb
app/views/layouts/application.html.erb
app/views/projects/index.html.erb
app/views/repositories/edit.html.erb
app/views/site/index.html.erb
app/views/users/show.html.erb
config/locales/en.rb
public/stylesheets/base.css