Merge branch 'wip-MDL-36322-m25' of https://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Feb 2013 02:25:57 +0000 (10:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Feb 2013 02:25:57 +0000 (10:25 +0800)

Trivial merge