Merge branch 'MDL-39317-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 03:26:53 +0000 (11:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 03:26:53 +0000 (11:26 +0800)

Trivial merge