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

Sat Apr 9 15:23:25 UTC 2011

The following commit has been merged in the master branch:
commit 1386fa061ec1521e134de6a4205920c30ffa3048
Merge: 1ae66f4ddac9cb98969b64efdadc4d7fb83281cd 9582580151e3b89d173db8bd8e3af7d3b81e4421
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sat Apr 9 16:45:14 2011 +0200

    Merge commit 'upstream/1.3.4_rc2'


-- 
ProFTPD core package