Merge branch 'MDL-35693_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 2 Oct 2012 03:47:57 +0000 (11:47 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Oct 2012 03:47:57 +0000 (11:47 +0800)

Trivial merge