Merge branch 'MOODLE_23_STABLE' into install_23_STABLE
authorAMOS bot <amos@moodle.org>
Sat, 8 Sep 2012 00:34:44 +0000 (00:34 +0000)
committerAMOS bot <amos@moodle.org>
Sat, 8 Sep 2012 00:34:44 +0000 (00:34 +0000)

Trivial merge