[SCM] x264/master: Update and finalize changelog

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ed7d81842bdf763dce0fc2dc8b967dc1f2161f8c
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Oct 21 12:30:05 2015 +0200

    Update and finalize changelog

diff --git a/debian/changelog b/debian/changelog
index be556f0..6fa99a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x264 (2:0.148.2601+gita0cd7d3-2) experimental; urgency=medium
+
+  * Pass --disable-asm while building on mips, mipsel, mips64el
+    (Closes: #802550)
+
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Wed, 21 Oct 2015 12:27:32 +0200
+
 x264 (2:0.148.2601+gita0cd7d3-1) experimental; urgency=medium
 
   * Update to new stable upstream

-- 
x264 packaging