Git merges in Moodle 2.4.0 by AMOS bot

commit caea6920a14b265d259b5f7939a71cf897ab06cf
Author: AMOS bot <amos@moodle.org>
Date:   Tue, 16 Oct 2012 08:34:54 +0800
Tag:    v2.4.0-beta

Merge branch 'master' into install_master

commit 259211556ee770d95d67565ed8ede0b16ffffeee
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 08 Sep 2012 08:34:41 +0800
Tag:    v2.4.0-beta

Merge branch 'master' into install_master