fixed typo in assgned
Merge branch 'muskox-master'

Closes #4424
Merge branch 'master' of git://github.com/bbodenmiller/gitlabhq into bbodenmiller-master
Tweak wording and phrasing
Merge branch 'bbodenmiller-master'

Closes #4331
Doc: set permission on config.database.yml
Fixed db/schema.rb
Merge pull request #4460 from tstone2077/feature_help_markdown

Adding detailed documentation of the markdown syntax.
Merge branch 'master' into 6-0-dev

Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
Update gitlab_git version
Remove capistrano files since its very problematic to deploy gitlab with it
Merge pull request #4442 from 1ed/projects-helper-fix

fixed nav bar for empty repos (fixes #4375)
Merge pull request #4415 from jackbot/master

Couple of UI additions
Show shotcut dialog on ?
Merge remote-tracking branch 'upstream/master'
Added update and delete_attachment actions to note controller
Prevent 'toplevel constant SnippetsController referenced by Project::SnippetsController' warning
Ability to edit comments
Authorize user on note update
Removed before_filter as authentication is done within update method