[libconfig-general-perl] 01/04: Merge tag 'upstream/2.60'

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libconfig-general-perl.

commit f78fda0b9b137f6d1b74369b6ee7095ab32bb479
Merge: bb35888 4f92daf
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Oct 23 16:20:08 2015 +0200

    Merge tag 'upstream/2.60'
    
    Upstream version 2.60

 Changelog                 | 2 ++
 General.pm                | 4 ++--
 MANIFEST                  | 2 ++
 META.json                 | 2 +-
 META.yml                  | 2 +-
 t/apache-include-opt.conf | 7 +++++++
 t/notincluded.conf.not    | 1 +
 7 files changed, 16 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-general-perl.git