Merge branch 'MDL-38880_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 15 Apr 2013 15:25:30 +0000 (16:25 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Apr 2013 15:25:30 +0000 (16:25 +0100)

Trivial merge