Merge branch 'wip-MDL-40100-m26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 07:34:48 +0000 (15:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 07:34:48 +0000 (15:34 +0800)

Trivial merge