Merge branch 'wip-MDL-39212-m26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Jul 2013 03:55:45 +0000 (11:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Jul 2013 03:55:45 +0000 (11:55 +0800)

Trivial merge