Git merges in Moodle 2.3.2 by AMOS bot

commit f84f35dda1001ca379c9a99c8429ef2848d016c3
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 08 Sep 2012 08:34:44 +0800
Tag:    v2.3.2

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE