Merge branch 'MDL-34228-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
authorDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 08:19:33 +0000 (16:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 08:19:33 +0000 (16:19 +0800)

Trivial merge