Merge branch 'MDL-36346_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 08:20:14 +0000 (16:20 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 08:20:14 +0000 (16:20 +0800)

Trivial merge