Merge branch 'MDL-37039-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 06:33:36 +0000 (14:33 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 06:33:36 +0000 (14:33 +0800)

Trivial merge