[Pkg-gnupg-commit] [gnupg2] 01/01: Merge in older debian master branch (2.1.18-*), ignoring old changes

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit 1d62cb35cbfcb0cdc9cfd1b7bb72bc7ecde748c2
Merge: c9dff8b 385f06c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Aug 11 12:55:12 2017 -0400

    Merge in older debian master branch (2.1.18-*), ignoring old changes
    
    This should make it easier for people following the development of the
    debian packaging to fast-forward their local copy, and makes it
    possible to do a regular fast-forward push.
    
    This merge uses the "ours" strategy, so any changes that were isolated
    on the 2.1.18-* series have been dropped (i think they are all either
    adopted or superseded on the master branch anyway)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git