Merge branch 'MDL-35603_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 06:27:39 +0000 (14:27 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 06:27:39 +0000 (14:27 +0800)

Trivial merge