[SCM] forked-daapd/master: Merge tag 'upstream/21.0'

[rbalint at users.alioth.debian.org]

Imported Upstream version 21.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: 0aa0eff66ec39e4f8a728412b077e44ab3fc474f
X-Git-Newrev: c737fce73c7d25e6c30374fc8afb578baccc4312

The following commit has been merged in the master branch:
commit 06e0c25777703caed71826da3c6370044dc7102d
Merge: 0aa0eff66ec39e4f8a728412b077e44ab3fc474f b393787cc6483c0ed9fd706235c16404f2926a52
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun Jun 15 13:44:24 2014 -0700

    Merge tag 'upstream/21.0'
    
    Upstream version 21.0
    
    # gpg: Signature made Sun 15 Jun 2014 01:44:16 PM PDT using RSA key ID B4691A7D
    # gpg: Good signature from "Balint Reczey <balint at balintreczey.hu>"


-- 
forked-daapd packaging