[libsoftware-license-perl] 02/07: Merge remote-tracking branch 'origin/master' into fix-missing-merge

[dod at debian.org]

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

dod pushed a commit to branch master
in repository libsoftware-license-perl.

commit ec3237e4a874f1910efeeb6c9e3524977bc7d245
Merge: adf1424 bab0f4c
Author: Dominique Dumont <dod at debian.org>
Date:   Mon Apr 7 20:26:50 2014 +0200

    Merge remote-tracking branch 'origin/master' into fix-missing-merge

 debian/changelog                    | 13 +++++++++++--
 debian/control                      |  2 +-
 debian/copyright                    |  6 +++---
 debian/patches/add_or_later_clause  | 14 +++++++-------
 debian/patches/artistic_1.0_summary |  2 +-
 debian/patches/backward-compat      | 14 +++++++++-----
 debian/patches/summary_method       | 30 +++++++++++++-----------------
 debian/patches/summary_test         |  6 +++---
 debian/watch                        |  2 +-
 9 files changed, 49 insertions(+), 40 deletions(-)

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