Merge branch 'MDL-30545_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 13 Nov 2012 05:22:47 +0000 (13:22 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Nov 2012 05:22:47 +0000 (13:22 +0800)

Trivial merge