Merge branch 'MDL-36422-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 03:08:06 +0000 (11:08 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 03:08:06 +0000 (11:08 +0800)

Trivial merge