[proftpd/el6/master] (13 commits) ...Merge branch 'master' into el6

[Paul Howarth]

Summary of changes:

  65d2f81... update to 1.3.2b; drop upstreamed defines patch (bug 3221) (*)
  39d6c5d... Update F-10, F-11, EL-4, EL-5 to 1.3.2b (fixes improper SSL (*)
  c179209... Fix typo that causes a failure to update the common directo (*)
  01817b6... Reduce the mod_facts patch to the single commit addressing  (*)
  6c9949e... Add patch for upstream bug 3350 - segfault on auth failures (*)
  7a46328... - Update to 1.3.2c, addressing the following issues: - SSL/ (*)
  beb7c5d... Update to 1.3.2d (*)
  f757bcc... - Update to 1.3.3 (see NEWS for list of fixed bugs) - Updat (*)
  2f2203c... - Update to 1.3.3a - Added Japanese translation - Many mod_ (*)
  8f2f194... dist-git conversion (*)
  24eba86... Merge branch 'master' into el6
  a586c73... Update to 1.3.3b (*)
  af2143d... Merge branch 'master' into el6

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