Merge branch 'MDL-38369-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 02:26:14 +0000 (10:26 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 02:26:14 +0000 (10:26 +0800)

Trivial merge