[libyaml-libyaml-perl] 01/01: Merge branch 'master' into gregoa/use-system-yaml

[gregor herrmann]

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

gregoa pushed a commit to branch gregoa/use-system-yaml
in repository libyaml-libyaml-perl.

commit 57b054922ab6c867959eec2fd745299e8654c359
Merge: 3a49d1c 27d0dd7
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Jul 20 15:44:53 2014 +0200

    Merge branch 'master' into gregoa/use-system-yaml
    
    Conflicts:
    	debian/patches/series

 Changes                        |  3 +++
 META.json                      |  2 +-
 META.yml                       |  2 +-
 Makefile.PL                    |  2 +-
 debian/changelog               |  8 ++++----
 debian/patches/pod-error.patch | 19 -------------------
 debian/patches/series          |  1 -
 lib/YAML/LibYAML.pm            |  2 +-
 lib/YAML/XS.pm                 |  2 +-
 lib/YAML/XS.pod                |  2 --
 10 files changed, 12 insertions(+), 31 deletions(-)

diff --cc debian/patches/series
index 7805d77,d672fb4..c54bc7e
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -4,5 -4,3 +4,4 @@@ libyaml-string-overflow.patc
  libyaml-node-id-hardening.patch
  libyaml-guard-against-overflows-in-indent-and-flow_level.patch
  CVE-2014-2525.patch
- pod-error.patch
 +use-system-yaml.patch

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