Git merges in Moodle 2.3.10 by AMOS bot

commit 77cb09867c0c4a8bd3c879cec6a5ff9f02e97cb3
Author: AMOS bot <amos@moodle.org>
Date:   Sun, 08 Sep 2013 08:43:15 +0800
Tag:    v2.3.10

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE


commit 22c1afc8f9e13d88bd1889d69c188156a12080df
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 06 Sep 2013 08:47:52 +0800
Tag:    v2.3.10

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE