Merge branch 'MDL-39080_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 16 Apr 2013 11:45:14 +0000 (12:45 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Apr 2013 11:45:14 +0000 (12:45 +0100)

Trivial merge