Merge branch 'MDL-25953-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 04:01:56 +0000 (12:01 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 04:01:56 +0000 (12:01 +0800)

Trivial merge