Merge branch 'wip-MDL-43024-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 03:06:39 +0000 (11:06 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 03:06:39 +0000 (11:06 +0800)

Trivial merge