Merge branch 'wip-MDL-36825-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:37:49 +0000 (13:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:37:49 +0000 (13:37 +0800)

Trivial merge