Merge branch 'MOODLE_23_STABLE' into install_23_STABLE
authorAMOS bot <amos@moodle.org>
Sat, 27 Jul 2013 00:43:15 +0000 (00:43 +0000)
committerAMOS bot <amos@moodle.org>
Sat, 27 Jul 2013 00:43:15 +0000 (00:43 +0000)

Trivial merge