[ack-grep] 01/01: Merge tag 'upstream/2.12'

[Axel Beckert]

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

abe pushed a commit to branch master
in repository ack-grep.

commit 318dc6342edb30e547e889c9502b13bc0f16a804
Merge: c95fc13 0560b7a
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Dec 10 13:06:46 2013 +0100

    Merge tag 'upstream/2.12'
    
    Upstream version 2.12
    
    # gpg: Signature made Tue 10 Dec 2013 01:06:41 PM CET using DSA key ID 95930EDE
    # gpg: Good signature from "Axel Beckert (no legal relevance) <abe at deuxchevaux.org>"
    # gpg:                 aka "Axel Beckert (no legal relevance) <abe at noone.org>"
    # gpg:                 aka "Axel Beckert (no legal relevance) <xtaran at symlink.ch>"

 Ack.pm                      |  10 ++---
 Changes                     |  35 ++++++++++++++-
 ConfigDefault.pm            |   3 ++
 ConfigFinder.pm             |  17 +++----
 ConfigLoader.pm             | 105 ++++++++++++++++++++++++++++++--------------
 MANIFEST                    |   7 ++-
 META.json                   |   8 ++--
 META.yml                    |   6 +--
 Makefile.PL                 |   9 ++--
 ack                         |  37 +++++++++++-----
 t/Util.pm                   |  66 +++++++++++++++++++++++++++-
 t/ack-dump.t                |   2 +-
 t/ack-files-from.t          |   2 +-
 t/ack-filetypes.t           |   2 +-
 t/ack-g.t                   |  51 +++++++++++++++++++--
 t/ack-line.t                |   2 +-
 t/ack-match.t               |  60 ++++++++++++++++++++++++-
 t/ack-o.t                   |  57 +++++++++++++++++++++++-
 t/ack-pager.t               |  58 +++++++++++++++++++++++-
 t/ack-print0.t              |  16 +++----
 t/ack-removed-options.t     |   4 +-
 t/ack-s.t                   |   4 +-
 t/ack-type-del.t            |   8 ++--
 t/ack-type.t                |  14 +++---
 t/ack-x.t                   |   2 +-
 t/bad-ackrc-opt.t           |   2 +-
 t/config-backwards-compat.t |   2 +-
 t/config-finder.t           |  54 ++++++++++++-----------
 t/config-loader.t           | 104 +++++++++++++++++++++++--------------------
 t/context.t                 |  51 ++++++++++++++++++++-
 t/file-permission.t         |  74 +++++++++++++++++--------------
 t/filetypes.t               |   3 +-
 t/highlighting.t            |  71 ++++++++++++++++++++++++++++++
 t/lib/00-coverage.t         |  26 +++++++++++
 t/lib/Collection.t          |  12 +++++
 t/lib/ExtensionGroup.t      |  12 +++++
 t/lib/IsGroup.t             |  12 +++++
 t/mutex-options.t           |  10 +++--
 t/noenv.t                   |  40 +++++++++--------
 xt/man.t                    |   3 +-
 40 files changed, 817 insertions(+), 244 deletions(-)

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