Git merges in Moodle 2.4.x by Petr Škoda

commit d34770032c72015322b0e80285823ec4ed711e81
Author: Petr Škoda <commits@skodak.org>
Date:   Sun, 30 Sep 2012 20:35:57 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35562' of git://github.com/danmarsden/moodle into w40_MDL-35701_m24_enroldb