Merge branch 'MDL-37800_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 5 Feb 2013 04:43:24 +0000 (12:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Feb 2013 04:43:24 +0000 (12:43 +0800)

Trivial merge