Merge branch 'MDL-37924_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 05:36:15 +0000 (13:36 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 05:36:15 +0000 (13:36 +0800)

Trivial merge