Git merges in Moodle 2.4.6 by AMOS bot

commit 85ed2ec89b815a5612cc3e0e9037b61e52e8a27b
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 31 Aug 2013 08:43:57 +0800
Tag:    v2.4.6

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE


commit a8416f35c5d01bf66118289140bb88422833cc6e
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 24 Aug 2013 08:59:07 +0800
Tag:    v2.4.6

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE


commit 0c3fe2f5f0bb178287629fe795a49362c041847c
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 27 Jul 2013 08:43:13 +0800
Tag:    v2.4.6

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE