Merge version 1:1.36.11-2+rpi1 and 1:1.36.11-3 to produce 1:1.36.11-3+rpi1

diff --cc debian/changelog
index fb6aac69f4d1a82663687f563fedc12f3db86464,07630db3dbab1e34bc819af5ea9b899ab0f520d2..077c93c3ca230f0802af9751e113c88a13dea205
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,9 +1,13 @@@
- libguestfs (1:1.36.11-2+rpi1) buster-staging; urgency=medium
++libguestfs (1:1.36.11-3+rpi1) buster-staging; urgency=medium
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 22 Jan 2018 04:00:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Feb 2018 19:06:36 +0000
++
+ libguestfs (1:1.36.11-3) unstable; urgency=medium
+ 
+   * Add patch to omit passing locking parameters for non-file disks
+   * Bump Standards-Version
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 23 Jan 2018 09:36:18 +0100
  
  libguestfs (1:1.36.11-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge