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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3c16e02fcd9ad6784e524fab001ec63830db4f38
X-Git-Newrev: 54deb177d4b04b8cb4041115000d2755bf2a91e1

The following commit has been merged in the master branch:
commit 54deb177d4b04b8cb4041115000d2755bf2a91e1
Merge: 3437b047c541e9c236dccf6ed38539a01d6cfbc3 216cf66cf004819740666952c4435ac874c5b0f2
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 26 08:13:48 2011 +0200

    Merge commit 'upstream/2.4.0'


-- 
cmus packaging