Merge branch 'MDL-34204_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 19 Nov 2012 02:33:31 +0000 (10:33 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Nov 2012 02:33:31 +0000 (10:33 +0800)

Trivial merge