[SCM] cmus/master: Merge tag 'upstream/2.5.0' into master.experimental

[alessio at users.alioth.debian.org]

Imported Upstream version 2.5.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: 817d29d91ae76cbf19051b4e43ef308908bf2cb9
X-Git-Newrev: 1b2253e44c4d15e556b8b3721fdf71d54ae0452d

The following commit has been merged in the master branch:
commit af6f5e196a2fe6c93bf479fce87a350bf142aa43
Merge: 9e0f727558dc8aa1f1356937afe656aa858383c2 14c18c235e1ffe370c25bdb76041e822d8317f4e
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Nov 15 00:27:32 2012 +0000

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


-- 
cmus packaging