Merge branch 'feature/shortcuts' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
Fix error when reassign issue/merge_request from non-assigned. Fixes #3201
Merge branch 'master' into 6-0-dev

Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb
Work on themes a bit
Prevent tree log crash if commit missing
group filter from dashboard. Design improvements of dashboard
Discover default branch on project creationg
Minor UI improve for dashboard events
Fix shortcuts popup
fix bug when project named: mediawiki

mediawiki.wiki.git
mediawiki.git

/.wiki$/ match awiki, so when your project named mediawiki
it will be find project named: "medi"

use /\.wiki$/ fix this bug
Fix commit pagination
docs to ruby 2.0
Update puma
Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473, #4451
navbar tooltip position fix when "loading" appears.
Puma to 2.3.1
cleanup puma config a bit
Merge branch 'master' into 6-0-dev

Conflicts:
	Gemfile
	Gemfile.lock
Milestone page: reduce truncate length to prevent issue title overflow
Disable threadsafety