Merge version 3.6.1.1-1+rpi1 and 3.6.1.3-1 to produce 3.6.1.3-1+rpi1

diff --cc debian/changelog
index 36ea1edc9e5777b54bd043a15e0127e073f42ed6,d089e21d1dbc54827d8ac58e84f07e737ab52eea..536d7a3cff9cebec1ba6adfc7f839f83e0bbdae2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- protobuf (3.6.1.1-1+rpi1) buster-staging; urgency=medium
++protobuf (3.6.1.3-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 3.6.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 25 Oct 2018 12:28:38 +0000]
 +  * Add armhf to libatomic architectures list.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 04 Dec 2018 20:02:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Dec 2018 16:14:24 +0000
++
+ protobuf (3.6.1.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Mark libprotobuf-java Multi-Arch foreign.
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sun, 09 Dec 2018 12:45:11 +0000
+ 
+ protobuf (3.6.1.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Remove Python 3.7 patches as applied upstream.
+ 
+   [ Michael Vogt <michael.vogt@ubuntu.com> ]
+   * Remove explicit #!/usr/bin/python2.4 usage (closes: #600261).
+ 
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sat, 08 Dec 2018 16:13:58 +0000
  
  protobuf (3.6.1.1-1) unstable; urgency=medium