Merge branch 'wip-MDL-45414-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 04:05:17 +0000 (12:05 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 04:05:17 +0000 (12:05 +0800)

Trivial merge