Merge branch 'MDL-37694_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 03:54:51 +0000 (11:54 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 03:54:51 +0000 (11:54 +0800)

Trivial merge