Merge branch 'MDL-37074-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 05:40:04 +0000 (13:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 05:40:04 +0000 (13:40 +0800)

Trivial merge