Merge branch 'MDL-35376_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 17 Sep 2012 04:47:53 +0000 (12:47 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Sep 2012 04:47:53 +0000 (12:47 +0800)

Trivial merge