[SCM] cmus/master: Merge tag 'upstream/2.6.0'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.6.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: 7918dfaa63f13d7e2243cfc6d4993d1e8e397005
X-Git-Newrev: 57a6f56d58650814bbc1745bd876b8684a93aa63

The following commit has been merged in the master branch:
commit c850b4662c7ca1421c7e73f9939293aa5c5eff6c
Merge: 7918dfaa63f13d7e2243cfc6d4993d1e8e397005 f068fd81b68718eb494a897b6120b61a290719f5
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Aug 14 15:33:38 2014 +0100

    Merge tag 'upstream/2.6.0'
    
    Upstream version 2.6.0


-- 
cmus packaging