Merge branch 'MDL-35297_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 01:54:12 +0000 (09:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 01:54:12 +0000 (09:54 +0800)

Trivial merge