# Conflicts:
#	Gemfile.lock
#	app/controllers/projects/issues_controller.rb
#	app/models/ci/runner.rb
#	app/views/admin/dashboard/index.html.haml
#	app/views/layouts/nav/sidebar/_admin.html.haml
#	doc/README.md
#	lib/ci/model.rb
#	lib/gitlab/workhorse.rb
#	spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
[ci skip]