Merge branch 'MDL-30909-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 18 Sep 2012 07:08:00 +0000 (15:08 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Sep 2012 07:08:00 +0000 (15:08 +0800)

Trivial merge