[SCM] smplayer/master: Merge tag 'upstream/14.9.0.6690_ds0'

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

Imported Upstream version 14.9.0.6690~ds0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c91887ecedfa97fc92fb6edf3a4e7c4437e178dd
X-Git-Newrev: 97ccf488f312fd7f12a2b7cf77e436ea99941c90

The following commit has been merged in the master branch:
commit 865b9987a53aa13d6a964b3e0709c5ff2764f315
Merge: c91887ecedfa97fc92fb6edf3a4e7c4437e178dd 45ee5ac6dc2159352596ce8e8ec744e0c864d492
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sat Apr 25 16:18:23 2015 +0200

    Merge tag 'upstream/14.9.0.6690_ds0'
    
    Upstream version 14.9.0.6690~ds0


-- 
smplayer packaging