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

[Paul Howarth]

Summary of changes:

  b0acaa5... update to 1.3.2b; drop upstreamed defines patch (bug 3221) (*)
  a8a7f7e... Fix typo that causes a failure to update the common directo (*)
  010e4d7... Reduce the mod_facts patch to the single commit addressing  (*)
  1b18035... Add patch for upstream bug 3350 - segfault on auth failures (*)
  d38fa80... - Update to 1.3.2c, addressing the following issues: - SSL/ (*)
  cc342b7... Update to 1.3.2d (*)
  bde6abe... Initialize branch EL-6 for proftpd (*)
  d153943... Update to 1.3.3 (*)
  98cfe4b... - Update to 1.3.3a - Added Japanese translation - Many mod_ (*)
  541e5da... dist-git conversion (*)
  24eba86... Merge branch 'master' into el6 (*)
  af2143d... Merge branch 'master' into el6 (*)
  ac9e173... Merge branch 'master' into el6 (*)
  94ca052... Merge branch 'master' into el6 (*)

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