Git merges in Moodle 2.4.10 by AMOS bot

commit 9bf48960a30315de7038d7da6a8a79f485418b2e
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 09 May 2014 08:41:12 +0800
Tag:    v2.4.10

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE