[moodle/f12/master] (11 commits) ...Merge branch 'master' into f12

[Jon Ciesla]

Summary of changes:

  69c4ec6... New upstream, cron fix. (*)
  42b4d3d... Revert cron. (*)
  aa027f8... Reverted erroneous cron fix. (*)
  cd5ef8d... Fix typo that causes a failure to update the common directo (*)
  8f8b1aa... Update to 1.9.7, BZ 544766. (*)
  2b5d53f... New upstream, secuirty fix. (*)
  c4078f6... Update to 1.9.9, BZ 605810. (*)
  5bfae60... dist-git conversion (*)
  038981b... Multiple security fixes. (*)
  b99665e... Typo fix, BZ 631998 (*)
  612b2e5... Merge branch 'master' into f12

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