Merge branch 'MDL-38500-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 10:54:32 +0000 (11:54 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 10:54:32 +0000 (11:54 +0100)

Trivial merge