Merge version 1.4.0.20-3+rpi1 and 1.4.0.21-1 to produce 1.4.0.21-1+rpi1

diff --cc debian/changelog
index 8ebaa5ba22e5e96d07d0a9f02efd51e526e831e9,16639f01a00be3dc39d9f3d05913429d5be440f1..9690cb302e39d2cda4da48d2120f0c1d9d486307
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- 389-ds-base (1.4.0.20-3+rpi1) buster-staging; urgency=medium
++389-ds-base (1.4.0.21-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.4.0.19-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Dec 2018 01:27:25 +0000]
 +  * Add -latomic to LDFLAGS on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Jan 2019 13:51:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 25 Feb 2019 22:23:39 +0000
++
+ 389-ds-base (1.4.0.21-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Run offline upgrade only when upgrading from versions below 1.4.0.9,
+     ns-slapd itself handles upgrades in newer versions.
+   * rules: Actually install the minified javascript files. (Closes:
+     #913820)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 12 Feb 2019 16:28:15 +0200
  
  389-ds-base (1.4.0.20-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge