Merge branch 'MDL-37934_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 02:56:47 +0000 (10:56 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 02:56:47 +0000 (10:56 +0800)

Trivial merge