Merge branch 'MDL-35675-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 04:02:58 +0000 (12:02 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 04:02:58 +0000 (12:02 +0800)

Trivial merge