Merge version 2:0.148.2728+git4d5c8b0-1+rpi1 and 2:0.148.2748+git97eaef2-1 to produce...

diff --cc debian/changelog
index 54e9da66a989dd6d0bce0d1469ea12e063ef9729,3af1e0cf4163290926a916d6f51736cb9768275b..591519c20dcc87f2db3d66bf16b2534d2589dc89
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- x264 (2:0.148.2728+git4d5c8b0-1+rpi1) stretch-staging; urgency=medium
++x264 (2:0.148.2748+git97eaef2-1+rpi1) stretch-staging; urgency=medium
 +
 +  [Changes introduced in 2:0.142.2431+gita5831aa-1+rpi2 by Peter Michael Green]
 +  * Revert previous raspbian changes (not all of which were mentioned
 +    in the changelog, start again from debian source)
 +  * Pass --disable-asm for static build to prevent it being
 +    armv7/neon contaminated.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Dec 2016 15:31:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Feb 2017 14:48:07 +0000
++
+ x264 (2:0.148.2748+git97eaef2-1) unstable; urgency=medium
+ 
+   * Update to new stable upstream
+   * New upstream version 0.148.2748+git97eaef2
+   * Regenerate manpage
+ 
+  -- Rico Tzschichholz <ricotz@ubuntu.com>  Wed, 25 Jan 2017 10:40:48 +0100
  
  x264 (2:0.148.2728+git4d5c8b0-1) unstable; urgency=medium