Merge branch 'wip-MDL-43606-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 06:32:57 +0000 (14:32 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 06:32:57 +0000 (14:32 +0800)

Trivial merge