Merge branch 'fix_changelog' into 'master'

Fix wrong merged changelog entries

See merge request !514

CHANGELOG

@@ -19,7 +19,6 @@ v 7.10.0 (unreleased)
   - Disable reference creation for comments surrounded by code/preformatted blocks (Stan Hu)
   - Reduce Rack Attack false positives causing 403 errors during HTTP authentication (Stan Hu)
   - enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger)
-  - extend the commit calendar to show the actual commits made on a date (Hannes Rosenögger)
   - Fix a link in the patch update guide
   - Add a service to support external wikis (Hannes Rosenögger)
   - Omit the "email patches" link and fix plain diff view for merge commits
@@ -82,9 +81,11 @@ v 7.9.3
   - Allow admin to create public deploy keys that are accessible to any project.
   - Warn when gitlab-shell version doesn't match requirement.
   - Skip email confirmation when set by admin or via LDAP.
-
   - Only allow users to reference groups, projects, issues, MRs, commits they have access to.
 
+v 7.9.3
+  - Contains no changes
+
 v 7.9.2
   - Contains no changes