Merge branch 'MOODLE_23_STABLE' into install_23_STABLE
authorAMOS bot <amos@moodle.org>
Fri, 6 Sep 2013 00:47:52 +0000 (00:47 +0000)
committerAMOS bot <amos@moodle.org>
Fri, 6 Sep 2013 00:47:52 +0000 (00:47 +0000)

Trivial merge