proftpd patch
Merge remote-tracking branch 'origin/master'

Conflicts:
	preconf/proftpd/proftpd-mysql.conf