Merge branch 'wip-MDL-37263-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 03:22:43 +0000 (11:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 03:22:43 +0000 (11:22 +0800)

Trivial merge