Merge branch 'MDL-39536-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 05:25:38 +0000 (13:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 05:25:38 +0000 (13:25 +0800)

Trivial merge