Merge version 4:20.08.2-3+rpi1 and 4:20.08.3-1 to produce 4:20.08.3-1+rpi1

diff --cc debian/changelog
index 52650d9ffd6fc0a869fb0d138ef4166f54297cec,993e842e65b7509e3bfb60750f31406b8fc929c7..d45f1aace7e1bf7716860f3de772844b7534d2ad
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- akonadi (4:20.08.2-3+rpi1) bullseye-staging; urgency=medium
++akonadi (4:20.08.3-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:20.04.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 07 Jun 2020 20:57:50 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Nov 2020 19:22:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 19 Dec 2020 02:53:30 +0000
++
+ akonadi (4:20.08.3-1) unstable; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * New upstream release (20.08.3).
+   * Bump Standards-Version to 4.5.1 (No changes needed).
+ 
+  -- Sandro Knauß <hefee@debian.org>  Wed, 16 Dec 2020 01:38:46 +0100
  
  akonadi (4:20.08.2-3) unstable; urgency=medium