[SCM] bristol/master: Merge tag 'upstream/0.60.11' into master.experimental

[alessio at users.alioth.debian.org]

Imported Upstream version 0.60.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b677a22a7243809a64e8b3b670204514bb6bd5e5
X-Git-Newrev: 620782c6f2f4489044bc2791685048cccb610737

The following commit has been merged in the master branch:
commit 1a44c0193427fe89a78aac4f45b53de52175ceed
Merge: 445d09871cce151eb1a217cd2b2fd3835932c4af 18bc6b4f69989fec63f182b51de3add9bb7010fc
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 31 00:57:00 2013 +0000

    Merge tag 'upstream/0.60.11' into master.experimental
    
    Upstream version 0.60.11


-- 
bristol packaging