Merge branch 'wip-MDL-39814-m26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Jul 2013 04:19:39 +0000 (12:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Jul 2013 04:19:39 +0000 (12:19 +0800)

Trivial merge