Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	lib/gitlab/upgrader.rb

lib/gitlab/upgrader.rb

@@ -51,7 +51,7 @@ module Gitlab
       {
         "Stash changed files" => "git stash",
         "Get latest code" => "git fetch",
-        "Switch to new version" => "git checkout -b v#{latest_version}-ee",
+        "Switch to new version" => "git checkout v#{latest_version}-ee",
         "Install gems" => "bundle",
         "Migrate DB" => "bundle exec rake db:migrate RAILS_ENV=production",
         "Recompile assets" => "bundle exec rake assets:clean assets:precompile RAILS_ENV=production",