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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4ab446fed0571751cc860ed44d10f9524c019715
X-Git-Newrev: b9fd73e4a643f13bcafd7afa8a1fbbe353a3e1ba

The following commit has been merged in the master branch:
commit b2c79b0f8395f9d2df1b0e1ebca265cbaa82410a
Merge: 4ab446fed0571751cc860ed44d10f9524c019715 e015710eae3087a6b41420d105323a16ef24cf08
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Mar 30 18:39:33 2014 +0100

    Merge tag 'upstream/2.1'
    
    Upstream version 2.1


-- 
smtube packaging