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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 485cc4bc476aeb118c7ffe6bb1a6f6260832f251
X-Git-Newrev: 3e67b793fde1637072c6d6cd3bdd7fab2327341c

The following commit has been merged in the master branch:
commit 3e67b793fde1637072c6d6cd3bdd7fab2327341c
Merge: 485cc4bc476aeb118c7ffe6bb1a6f6260832f251 cdef3486dcd09ab03bff8b7a98b9cfbb3a7068d7
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 1 13:23:29 2013 +0100

    Merge tag 'upstream/1.6'
    
    Upstream version 1.6


-- 
smtube packaging