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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.4.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: b9b0572f405664e2381296e73441a2f3ef32a072
X-Git-Newrev: 47d88304596036d51e85a133c34bbcd54de0c50f

The following commit has been merged in the master branch:
commit 47d88304596036d51e85a133c34bbcd54de0c50f
Merge: b9b0572f405664e2381296e73441a2f3ef32a072 eeddfe20beec2d46125bc08e9dda9e090c20a10b
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jul 26 10:05:25 2011 +0200

    Merge commit 'upstream/2.4.2'


-- 
cmus packaging