Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 02:23:15 +0000 (10:23 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 02:23:15 +0000 (10:23 +0800)

Trivial merge