[SCM] cmus/master: Merge commit 'upstream/2.3.5'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.3.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 44ed79d1670a2048a966f7604a6351a29f9633e0
X-Git-Newrev: 32cfa1730e1e767af78fbab1d3bc23a12673b831

The following commit has been merged in the master branch:
commit 32cfa1730e1e767af78fbab1d3bc23a12673b831
Merge: 44ed79d1670a2048a966f7604a6351a29f9633e0 4d9579d8b88ffcd412a0d7ef1e3b63c48ed7c9d6
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Apr 23 09:39:17 2011 +0200

    Merge commit 'upstream/2.3.5'


-- 
cmus packaging