[SCM] ffdiaporama/master: Merge branch 'master' into unstable-1.5

[sramacher at users.alioth.debian.org]

Compile against libav10 (Closes: #739221)
Merge tag 'upstream/1.6'
Imported Upstream version 1.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 120818abe277891fc730f9cba3bc5ff17805892c
X-Git-Newrev: cc03b8ef65ef7e5d1c49e9ced3636304d99d4bc6

The following commit has been merged in the master branch:
commit cc03b8ef65ef7e5d1c49e9ced3636304d99d4bc6
Merge: 27ec6575ba9b75fd8024b6f935a0271e4ee72a41 120818abe277891fc730f9cba3bc5ff17805892c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon May 12 01:37:56 2014 +0200

    Merge branch 'master' into unstable-1.5
    
    Conflicts:
    	debian/changelog


-- 
ffdiaporama packaging