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

[rbalint at users.alioth.debian.org]

Imported Upstream version 22.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: 69590f95a0c420583233cf6dc2d300df91668180
X-Git-Newrev: 5e2f9e2fbb69324ee564b6bcfbde418390b31d73

The following commit has been merged in the master branch:
commit 34a300bc6580c3be55e404d460bca450842dc70f
Merge: 69590f95a0c420583233cf6dc2d300df91668180 712fc7a3609d99366962cd8c05ed6dfce5a5a942
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Oct 16 23:28:19 2014 +0200

    Merge tag 'upstream/22.0'
    
    Upstream version 22.0
    
    # gpg: Signature made Thu 16 Oct 2014 11:28:13 PM CEST using RSA key ID B4691A7D
    # gpg: Good signature from "Balint Reczey <balint at balintreczey.hu>"


-- 
forked-daapd packaging