[Pkg-privacy-commits] [codecrypt] 02/03: Merge remote-tracking branch 'origin/master'

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository codecrypt.

commit 9fa8f2ef34bcce03560b63cff42457dce87ebf18
Merge: ce0b89b c5543e4
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Apr 21 22:13:56 2016 +0200

    Merge remote-tracking branch 'origin/master'

 debian/control   | 3 ++-
 debian/copyright | 4 ++--
 debian/gbp.conf  | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --cc debian/control
index bb89d5f,f569b34..6924ecc
--- a/debian/control
+++ b/debian/control
@@@ -1,9 -1,10 +1,10 @@@
  Source: codecrypt
  Section: utils
  Priority: optional
- Maintainer: Mirek Kratochvil <exa.exa at gmail.com>
+ Maintainer: Debian Privacy Tools Maintainers <pkg-privacy-maintainers at lists.alioth.debian.org>
+ Uploaders: Mirek Kratochvil <exa.exa at gmail.com>
 -Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, libgmp-dev, libcrypto++-dev, libfftw3-dev
 -Standards-Version: 3.9.7
 +Build-Depends: debhelper (>= 9), dh-autoreconf, libgmp-dev, libcrypto++-dev, libfftw3-dev, pkg-config
 +Standards-Version: 3.9.8
  Homepage: http://e-x-a.org/codecrypt
  
  Package: codecrypt

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