Merge branch 'MDL-34742-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 03:59:30 +0000 (11:59 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 03:59:30 +0000 (11:59 +0800)

Trivial merge