[libcrypt-cracklib-perl] 02/02: Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libcrypt-cracklib-perl

[Christoph Martin]

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

chrism pushed a commit to branch master
in repository libcrypt-cracklib-perl.

commit 231077faa88f51ac1da45de64a0b4d0ce91c3d6a
Merge: 80b0d09 cc777a2
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Fri Sep 20 09:08:33 2013 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libcrypt-cracklib-perl
    
    Conflicts:
    	debian/changelog

 debian/changelog |    4 ++--
 debian/copyright |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 42c735c,626630b..081329c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,5 @@@
--libcrypt-cracklib-perl (1.7-1) UNRELEASED; urgency=low
++libcrypt-cracklib-perl (1.7-1) unstable; urgency=low
  
    * Initial Release. (closes: #627201)
  
-  -- Christoph Martin <christoph.martin at uni-mainz.de>  Thu, 19 Sep 2013 11:03:45 +0200
 - -- TODO <todo at example.org>  Mon, 02 Sep 2013 18:46:47 +0200
++ -- Christoph Martin <christoph.martin at uni-mainz.de>  Fri, 20 Sep 2013 09:07:57 +0200

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