Merge branch 'wip-MDL-45421-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 06:16:20 +0000 (14:16 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 06:16:20 +0000 (14:16 +0800)

Trivial merge