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

[rbalint at users.alioth.debian.org]

New upstream version 25.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: da4085ba279d380d03d9f7f7b426eef689a0380d
X-Git-Newrev: 2afe27ff3015a8f1faa61a8e8c42e29ba79d7160

The following commit has been merged in the master branch:
commit 01a3fe9cfb7cdd9669aa6d805d276452d51a7730
Merge: da4085ba279d380d03d9f7f7b426eef689a0380d 80d97d7e55e6e34c6e836941fb6f3b9d579363c6
Author: Balint Reczey <balint.reczey at canonical.com>
Date:   Thu Jul 27 14:02:43 2017 +0200

    Merge tag 'upstream/25.0'
    
    Upstream version 25.0

diff --combined .gitignore
index 06ae9c4,638124c..fa53487
--- a/.gitignore
+++ b/.gitignore
@@@ -29,7 -29,12 +29,10 @@@ missin
  stamp-h1
  autotools-stamp
  build-stamp
+ forked-daapd.spec
+ forked-daapd.conf
+ forked-daapd.service
  
 -# ignore debian packaging for convenience
 -debian/
  
  /.settings
  /.cproject

-- 
forked-daapd packaging