Merge branch 'MDL-36243_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 08:24:34 +0000 (16:24 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 08:24:34 +0000 (16:24 +0800)

Trivial merge