# Conflicts:
#	db/migrate/20160621123729_add_rebase_commit_sha_to_merge_requests.rb
#	lib/gitlab/git/repository.rb

[ci skip]