[SCM] mpv/experimental-ffmpeg: Merge branch 'master' into experimental-ffmpeg

[ghedo at users.alioth.debian.org]

Finalize changelog
New upstream release
Merge tag 'upstream/0.6.2'
Imported Upstream version 0.6.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental-ffmpeg
X-Git-Reftype: branch
X-Git-Oldrev: a7132d728dbc7e4000732e392e6c80c7239780e2
X-Git-Newrev: 3cc760d9c90d8bd0fbdfb40f6533417a2c924a78

The following commit has been merged in the experimental-ffmpeg branch:
commit 201fa7f03520340034970f826ba9af212e0eca18
Merge: a7132d728dbc7e4000732e392e6c80c7239780e2 e6ba0cdf6256c07ab036311e546646e59a81b540
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Fri Oct 24 21:20:41 2014 +0200

    Merge branch 'master' into experimental-ffmpeg
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 16dca22,0bf6503..a38e4f4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ mpv (0.6.2-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Alessandro Ghedini <ghedo at debian.org>  Fri, 24 Oct 2014 21:16:49 +0200
+ 
 +mpv (0.6.1-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Sun, 12 Oct 2014 14:48:59 +0200
 +
  mpv (0.6.1-1) unstable; urgency=medium
  
    * New upstream release
@@@ -18,12 -18,6 +24,12 @@@
  
   -- Alessandro Ghedini <ghedo at debian.org>  Sun, 12 Oct 2014 14:39:57 +0200
  
 +mpv (0.6.0-1+ffmpeg) experimental; urgency=medium
 +
 +  * Build against ffmpeg (Closes: #763736)
 +
 + -- Alessandro Ghedini <ghedo at debian.org>  Sat, 04 Oct 2014 17:42:04 +0200
 +
  mpv (0.6.0-1) unstable; urgency=medium
  
    * New upstream release

-- 
mpv packaging