Merge branch 'master' into reply-by-email

CHANGELOG

VERSION

app/assets/javascripts/merge_request_widget.js.coffee

app/assets/stylesheets/generic/common.scss

app/assets/stylesheets/pages/explore.scss

app/controllers/admin/application_settings_controller.rb

app/controllers/admin/projects_controller.rb

app/controllers/application_controller.rb

app/controllers/explore/projects_controller.rb

app/controllers/help_controller.rb

app/controllers/import/gitorious_controller.rb

app/controllers/import/google_code_controller.rb

app/controllers/projects/blob_controller.rb

app/controllers/projects/compare_controller.rb

app/controllers/projects/merge_requests_controller.rb

app/helpers/application_settings_helper.rb

app/helpers/explore_helper.rb

app/helpers/tab_helper.rb

app/models/application_setting.rb

app/models/merge_request.rb