[SCM] ffms2/master: Merge tag 'upstream/2.17+r731'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.17+r731
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 838be9a6caffe57dc848d14a6a8d3ffa4c601081
X-Git-Newrev: a18705dad04bbbd3678be30d354811c400988cb1

The following commit has been merged in the master branch:
commit a8c170b2cf6271aaa0c27abc3a8a7a62573c52fc
Merge: 8de9738f45ebc14971f1284f4b8d3a83b72cce3e 79d958a27968793466595b5fa890827e0d8a3aaf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Nov 7 20:10:18 2012 +0100

    Merge tag 'upstream/2.17+r731'
    
    Upstream version 2.17+r731


-- 
ffms2 packaging