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

Trivial merge