[postfwd] 03/03: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/postfwd

[Jan Wagner]

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

waja pushed a commit to branch master
in repository postfwd.

commit b5b77ec50865e9a61d5370a843bbfd8709aa8e89
Merge: 7fcf2ae abf946a
Author: Jan Wagner <waja at cyconet.org>
Date:   Wed Nov 20 21:16:09 2013 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/postfwd
    
    Conflicts:
    	debian/control


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