[SCM] smplayer/master: Merge branch 'upstream'

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

Imported Upstream version 15.11.0~ds0
Imported Upstream version 15.9.0~ds1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 366e953a861f2302d46c0b305aa6eb2d4fdf0905
X-Git-Newrev: d81f3ff8098e2b24d4f9d4178f2141f576fccb6f

The following commit has been merged in the master branch:
commit 3af9c37110ef029e8e70f11d5b6691b02a0f0be8
Merge: 691d85f0b80fbc64d0ebf2e53fe11cbc51f31e0c ef3806d30c06fc3b5c2910ef4faebef27bbd6bad
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sun Dec 6 19:09:37 2015 +0100

    Merge branch 'upstream'


-- 
smplayer packaging