Merge branch 'MDL-30731-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:31:38 +0000 (15:31 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:31:38 +0000 (15:31 +0800)

Trivial merge