[SCM] phasex/master: Merge commit 'upstream/0.12.0+m1'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.12.0+m1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1f46e4cccdb588385efad81ee7a917fbad0da073
X-Git-Newrev: 9591b7314a433920ac08e8ff2f46fab078a61b9a

The following commit has been merged in the master branch:
commit 0aaeccd5444d34b4871a7d8cbe2e82fb7a0838f4
Merge: 1f46e4cccdb588385efad81ee7a917fbad0da073 14eb231e990c529349ee0bcc0113b6266a6242d8
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Nov 19 14:17:38 2010 +0100

    Merge commit 'upstream/0.12.0+m1'
    
    Resolved conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/docs
    	debian/rules


-- 
phasex packaging