[all-knowing-dns] 01/02: Merge branch 'upstream'

[Michael Stapelberg]

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

stapelberg pushed a commit to branch master
in repository all-knowing-dns.

commit e91acc1a5b830ffb74817f161cb7f0ee5ae53913
Merge: a5f297f 764a390
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   Mon Sep 9 05:40:02 2013 +0200

    Merge branch 'upstream'

 Changes                                |    8 +++++
 MANIFEST                               |    1 +
 META.yml                               |    6 ++--
 MYMETA.yml                             |    9 +++--
 lib/App/AllKnowingDNS/Config.pm        |   11 +++---
 lib/App/AllKnowingDNS/Handler.pm       |    2 +-
 lib/App/AllKnowingDNS/Zone.pm          |    2 +-
 script/all-knowing-dns                 |    6 ++--
 t/003-config.t                         |    4 +--
 t/{004-handler.t => 005-same-domain.t} |   60 +++++++++++---------------------
 10 files changed, 49 insertions(+), 60 deletions(-)

diff --cc META.yml
index f92f9a6,b1b0293..8b792fb
--- a/META.yml
+++ b/META.yml
@@@ -3,12 -3,12 +3,12 @@@ abstract: 
  author:
    - 'Michael Stapelberg, C<< <michael at stapelberg.de> >>'
  build_requires:
-   ExtUtils::MakeMaker: 6.59
+   ExtUtils::MakeMaker: 6.76
  configure_requires:
-   ExtUtils::MakeMaker: 6.59
+   ExtUtils::MakeMaker: 6.76
  distribution_type: module
  dynamic_config: 1
 -generated_by: 'Module::Install version 1.04'
 +generated_by: 'Module::Install version 1.06'
  license: bsd
  meta-spec:
    url: http://module-build.sourceforge.net/META-spec-v1.4.html

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