[SCM] bombono-dvd/master: Merge tag 'upstream/1.2.1_ds0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2.1~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: 720ea8e2b6d8504dfc29111b536a3410442d0980
X-Git-Newrev: 423ec39ad13595aec79d6f6ad3d080221c929135

The following commit has been merged in the master branch:
commit 423ec39ad13595aec79d6f6ad3d080221c929135
Merge: 79bc9a730a7f10d339d75130296072c14e1137e1 1f13757d5025aa1763cdde95bf9cf30acf8d8c0f
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Oct 9 10:38:55 2012 +0100

    Merge tag 'upstream/1.2.1_ds0'
    
    Upstream version 1.2.1~ds0
    
    Conflicts (solved):
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/rules


-- 
bombono-dvd packaging