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

Trivial merge