Merge branch 'wip-MDL-36888-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 04:55:42 +0000 (12:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 04:55:42 +0000 (12:55 +0800)

Trivial merge