[SCM] dvblast/master: Merge tag 'upstream/2.2'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: add33f8983614cd57e734e7261b31f7c36d2ad6d
X-Git-Newrev: 6c6e3528bff951bc1977f3b486af958078b1d4aa

The following commit has been merged in the master branch:
commit 6c6e3528bff951bc1977f3b486af958078b1d4aa
Merge: c9c6363b4ad78de6ed306f9d76fcb5e0d23fc953 86755b39e9bb0cd7015a3cd0e88d55d8e6bf6917
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Apr 12 02:00:13 2012 +0200

    Merge tag 'upstream/2.2'
    
    Upstream version 2.2
    
    Conflicts:
    	.gitignore


-- 
dvblast packaging