[proftpd/el5/master] (12 commits) ...Merge branch 'f14' into el5

[Paul Howarth]

Summary of changes:

  62b4ec0... Initialize branch F-13 for proftpd (*)
  84c328e... - Update to 1.3.3 (see NEWS for list of fixed bugs) - Updat (*)
  76002de... - Update to 1.3.3a - Added Japanese translation - Many mod_ (*)
  6e1579e... dist-git conversion (*)
  f10cfda... Merge branch 'master' into f13 (*)
  f89897f... Merge branch 'master' into f13 (*)
  d1a27ca... Merge branch 'master' into f13 (*)
  9ee11a1... Fix typo in configuration file (*)
  1e703b2... Add Default-Stop LSB keyword in initscript (*)
  c736d74... Change vulnerability reference from ZDI-CAN-925 to CVE-2010 (*)
  b0b1ef1... Update to 1.3.3d (*)
  8079a2f... Merge branch 'f14' into el5 (*)

(*) This commit already existed in another branch; no separate mail sent