Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

app/views/projects/merge_requests/show/_commits.html.haml

@@ -17,7 +17,7 @@
             - @commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE).each do |commit|
               = render "projects/commits/inline_commit", commit: commit, project: @merge_request.source_project
             %li
-              other #{@commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE} commits hidden top prevent performance issues.
+              other #{@commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE} commits hidden to prevent performance issues.
         - else
           %ul.all-commits.hide.well-list
             - @commits.each do |commit|

doc/install/installation.md

@@ -49,7 +49,7 @@ up-to-date and install it.
 
 Install the required packages (needed to compile Ruby and native extensions to Ruby gems):
 
-    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils
+    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils cmake
 
 Make sure you have the right version of Git installed