[SCM] x265/master: Merge remote-tracking branch 'origin/master'

[sramacher at users.alioth.debian.org]

Upload to unstable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6700a5bc308c60a5b36b8a5f471f55b736e639f4
X-Git-Newrev: 6a0649d98be8a96f7bf7bba40648da2ba6b03cbb

The following commit has been merged in the master branch:
commit 6a0649d98be8a96f7bf7bba40648da2ba6b03cbb
Merge: 91edc1ef72897443b289a4bd0d4913ae22664ad2 6700a5bc308c60a5b36b8a5f471f55b736e639f4
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Dec 29 14:17:12 2016 +0100

    Merge remote-tracking branch 'origin/master'

diff --combined debian/changelog
index 7f12fac,52645e8..04f2068
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
 +x265 (2.2-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * SONAME bump: libx265-95 -> libx265-102.
 +  * debian/rules: No longer disable PIE.
 +
 + -- Sebastian Ramacher <sramacher at debian.org>  Thu, 29 Dec 2016 14:00:02 +0100
 +
+ x265 (2.1-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Wed, 05 Oct 2016 23:57:29 +0200
+ 
  x265 (2.1-1) experimental; urgency=medium
  
    * New upstream release.

-- 
x265 packaging