[libfindbin-libs-perl] 01/07: Merge tag 'upstream/2.120'

[Intrigeri]

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

intrigeri pushed a commit to branch master
in repository libfindbin-libs-perl.

commit 0a8ce13c6552eee6e1cf1e428628e757a16dd60f
Merge: 135dde7 969e76e
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Apr 29 19:44:25 2015 +0000

    Merge tag 'upstream/2.120'
    
    Upstream version 2.120
    
    Conflicts:
    	Changes
    	META.json
    	META.yml
    	Makefile.PL
    	lib/FindBin/libs.pm
    	libs_curr_pm
    	t/09-base-subdir-scalar.t

 Changes                   |  5 +++++
 META.json                 |  4 ++--
 META.yml                  |  4 ++--
 Makefile.PL               |  2 +-
 lib/FindBin/libs.pm       |  7 ++-----
 libs_curr_pm              |  7 ++-----
 libs_old_pm               |  2 +-
 t/09-base-subdir-scalar.t | 37 ++++++++++++++++++++++---------------
 8 files changed, 37 insertions(+), 31 deletions(-)

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