Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq

Conflicts:
	app/views/projects/commit/show.html.haml
Merge branch 'master' of https://github.com/kckrinke/gitlabhq

Conflicts:
	app/views/projects/commit/show.html.haml