[SCM] tartini/master: Merge commit 'upstream/1.2'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2
Imported Upstream version 1.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: 5a4b27857283e61535df3b2d23e3bccba2689736
X-Git-Newrev: 45c43c9c3eb1c7222dcb3d17743b623fa7fc8f3f

The following commit has been merged in the master branch:
commit 45c43c9c3eb1c7222dcb3d17743b623fa7fc8f3f
Merge: 5a4b27857283e61535df3b2d23e3bccba2689736 20e0a3f416bf92e16212787b3c120121fe555f08
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 28 10:37:20 2011 +0100

    Merge commit 'upstream/1.2'


-- 
tartini packaging