Merge branch 'wip-MDL-37615-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 03:47:17 +0000 (11:47 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 03:47:17 +0000 (11:47 +0800)

Trivial merge