Merge branch 'MDL-36302-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 06:10:06 +0000 (14:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 06:10:06 +0000 (14:10 +0800)

Trivial merge