Merge branch 'wip-MDL-40136-m26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 05:37:18 +0000 (13:37 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 05:37:18 +0000 (13:37 +0800)

Trivial merge