[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-44-g8679026

[Francesco P. Lovergine]

The following commit has been merged in the master branch:
commit 86790263314b30155c9fde44201377ebb7f112db
Merge: 689631542da8ea5addeead590723add76c295fed 2f48c4e79faf04f7b4ba0feae8cbbe0937dde359
Author: Francesco P. Lovergine <francesco at lovergine.com>
Date:   Sat Apr 16 09:40:13 2011 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-proftpd/proftpd-dfsg
    
    Conflicts:
    	debian/proftpd-dev.README.Debian


-- 
ProFTPD core package