[389-admin/f12/master] (4 commits) ...Merge branch 'f13' into f12

[Richard Allen Megginson]

Summary of changes:

  b37a20f... Merge branch 'master' into f13 (*)
  78005ab... version 1.1.12.a1 - openldap support (*)
  9a50eb2... version 1.1.12.a2 to fix mozldap build breakage (*)
  a064fa8... Merge branch 'f13' into f12

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