[SCM] dvd95/master: Merge tag 'upstream/1.7p0_20130228.git01dd592f_ds0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.7p0~20130228.git01dd592f~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: 2eee4cfb52e96c89b6b044d30f670cd1ccc2bd70
X-Git-Newrev: 25206aad7ef735676a4c257b1e0177f5b673e5d5

The following commit has been merged in the master branch:
commit 25206aad7ef735676a4c257b1e0177f5b673e5d5
Merge: 2eee4cfb52e96c89b6b044d30f670cd1ccc2bd70 1bb0b02d1cae57f37f4614a17978c3c1103b0c7c
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 7 00:26:13 2013 +0100

    Merge tag 'upstream/1.7p0_20130228.git01dd592f_ds0'
    
    Upstream version 1.7p0~20130228.git01dd592f~ds0
    
    Conflicts:
    	.gitignore
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/docs
    	debian/rules


-- 
dvd95 packaging