Merge version 2.20.4-1+rpi1 and 2.20.5-1 to produce 2.20.5-1+rpi1

diff --cc debian/changelog
index 320e6c40453e380450d18882aabc8a4140063091,9c26645904a2fca61c4aa844047a4fc675f713ec..1a6eea6830716f302e2f21dbe375b5ae19cb6cfc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- webkit2gtk (2.20.4-1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.20.5-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Aug 2018 12:18:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Aug 2018 15:24:03 +0000
++
+ webkit2gtk (2.20.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/patches/fix-ftbfs-m68k.patch:
+     + Update patch (Closes: #902100).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Mon, 13 Aug 2018 10:52:34 +0300
  
  webkit2gtk (2.20.4-1) unstable; urgency=high