[qgis] 05/12: Merge changelog entry for 2.14.20+dfsg-2~exp3 into 2.14.21+dfsg-1~exp1.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository qgis.

commit ae7d9646f9f137da0beef0d2304390587e2f5d1b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 9 00:05:08 2017 +0100

    Merge changelog entry for 2.14.20+dfsg-2~exp3 into 2.14.21+dfsg-1~exp1.
---
 debian/changelog | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8fda551..404f6ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,16 +6,11 @@ qgis (2.14.21+dfsg-1) UNRELEASED; urgency=medium
   [ Bas Couwenberg ]
   * New upstream release.
   * Partially revert GRASS 7.4 changes to build with GRASS 7.2.
-
- -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Dec 2017 22:44:28 +0100
-
-qgis (2.14.20+dfsg-2~exp3) UNRELEASED; urgency=medium
-
   * Strip trailing whitespace from control file.
   * Disable use of QtWebKit.
     (closes: #882663)
 
- -- Bas Couwenberg <sebastic at debian.org>  Tue, 21 Nov 2017 10:08:49 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Dec 2017 22:44:28 +0100
 
 qgis (2.14.20+dfsg-2~exp2) experimental; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git