Merge branch 'wip-MDL-36938-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 07:18:50 +0000 (15:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 07:18:50 +0000 (15:18 +0800)

Trivial merge