Merge branch 'MDL-35158-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:28:59 +0000 (12:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:28:59 +0000 (12:28 +0800)

Trivial merge