Git merges in Moodle 2.3.3 by AMOS bot

commit 8434e7de85f6c4c01a4f61edf94a0d960b96faa2
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 20 Oct 2012 08:34:51 +0800
Tag:    v2.3.3

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE