Merge branch 'wip-MDL-39870-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 06:14:18 +0000 (14:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 06:14:18 +0000 (14:14 +0800)

Trivial merge