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

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

Imported Upstream version 16.1.0~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: 0b5f2613505c7048f79791776fdafac6a84db2c6
X-Git-Newrev: 7965f89924c2c525c93bf8573a9e0542011cbb05

The following commit has been merged in the master branch:
commit d2cb56f2f9c9c1f591bdedbbd981543fb90131f3
Merge: 0b5f2613505c7048f79791776fdafac6a84db2c6 ba0162e8cb8a12c90ef9775f5a20a6da095a0b35
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Thu Jan 21 21:35:17 2016 +0100

    Merge branch 'upstream'


-- 
smplayer packaging