[SCM] smtube/master: Merge tag 'upstream/15.5.10'

[onlyjob at users.alioth.debian.org]

Imported Upstream version 15.5.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 11cf10bd3cc234c0105ef0692c9209a7734ae536
X-Git-Newrev: 1a843787710839250701dce9925e6be4a4c69199

The following commit has been merged in the master branch:
commit 1a843787710839250701dce9925e6be4a4c69199
Merge: 7c82478b467d4961608973d96ad1ac31972f4f33 633a207bb6c5e5ca89d7a6099daf2a7a9dc1e12f
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Tue May 19 19:40:29 2015 +1000

    Merge tag 'upstream/15.5.10'
    
    Upstream version 15.5.10


-- 
smtube packaging