[mediawiki/f12/master] (9 commits) ...Merge branch 'master' into f12

[Nick Bebout]

Summary of changes:

  7406b7d... Fix typo that causes a failure to update the common directo (*)
  a84f46c... Update to 1.15.2. (*)
  a4c91e7... Update to 1.15.3. (*)
  d8c75c1... Update to 1.15.3. (take II) (*)
  3105dcb... Update to 1.15.4, fixes CVE-2010-1647 CVE-2010-1648, also f (*)
  3b8f72e... dist-git conversion (*)
  958f0ae... - Mark mediawiki.conf as config(noreplace) (RH bug #614396) (*)
  f8d8f99... Bump release (*)
  f35ee1f... Merge branch 'master' into f12

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