Merge branch 'MDL-36732_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 07:18:24 +0000 (15:18 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 07:18:24 +0000 (15:18 +0800)

Trivial merge