Merge branch 'm23_MDL-34440' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 02:07:05 +0000 (10:07 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 02:07:05 +0000 (10:07 +0800)

Trivial merge